From 6014bde3d03aecc0373dd1ee84195279fcc37db5 Mon Sep 17 00:00:00 2001 From: Jordon Moss Date: Sat, 16 Jul 2016 01:15:14 -0300 Subject: [PATCH] Renamed PushSpriteFrame to PushSpriteMDLFrame for consistency. --- src/gl/models/gl_models.cpp | 2 +- src/gl/models/gl_models.h | 2 +- src/gl/scene/gl_scene.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gl/models/gl_models.cpp b/src/gl/models/gl_models.cpp index 0b7870833..b73c42b3b 100644 --- a/src/gl/models/gl_models.cpp +++ b/src/gl/models/gl_models.cpp @@ -934,7 +934,7 @@ void gl_RenderFrameModels( const FSpriteModelFrame *smf, mdl->BuildVertexBuffer(); gl_RenderState.SetVertexBuffer(mdl->mVBuf); - mdl->PushSpriteFrame(smf, i); + mdl->PushSpriteMDLFrame(smf, i); if ( smfNext && smf->modelframes[i] != smfNext->modelframes[i] ) mdl->RenderFrame(tex, smf->modelframes[i], smfNext->modelframes[i], inter, translation); diff --git a/src/gl/models/gl_models.h b/src/gl/models/gl_models.h index a75e74305..f6967d1f7 100644 --- a/src/gl/models/gl_models.h +++ b/src/gl/models/gl_models.h @@ -47,7 +47,7 @@ public: const FSpriteModelFrame *curSpriteMDLFrame; int curMDLIndex; - void PushSpriteFrame(const FSpriteModelFrame *smf, int index) { curSpriteMDLFrame = smf; curMDLIndex = index; }; + void PushSpriteMDLFrame(const FSpriteModelFrame *smf, int index) { curSpriteMDLFrame = smf; curMDLIndex = index; }; FModelVertexBuffer *mVBuf; FString mFileName; diff --git a/src/gl/scene/gl_scene.cpp b/src/gl/scene/gl_scene.cpp index 619b94f84..4cb79262e 100644 --- a/src/gl/scene/gl_scene.cpp +++ b/src/gl/scene/gl_scene.cpp @@ -1113,7 +1113,7 @@ void FGLInterface::Precache(BYTE *texhitlist, TMap &actorhit } else if (smf->modelIDs[i] != -1) { - Models[smf->modelIDs[i]]->PushSpriteFrame(smf, i); + Models[smf->modelIDs[i]]->PushSpriteMDLFrame(smf, i); Models[smf->modelIDs[i]]->AddSkins(texhitlist); } if (smf->modelIDs[i] != -1)