Merge branch 'development' into stringTableEmptyString

This commit is contained in:
Thomas Dickerson 2017-01-24 12:35:34 -05:00 committed by GitHub
commit 6963d35145
120 changed files with 2503 additions and 5816 deletions

View file

@ -480,7 +480,7 @@ void RenderPrePassMgr::render( SceneRenderState *state )
if (passRI->accuTex != lastAccuTex)
{
sgData.accuTex = passRI->accuTex;
lastAccuTex = lastAccuTex;
lastAccuTex = passRI->accuTex;
dirty = true;
}