TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-12 19:31:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into stringTableEmptyString

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/renderInstance/renderMeshMgr.cpp
View file

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

1
Engine/source/renderInstance/renderPassManager.cpp
View file

@ -124,6 +124,7 @@ RenderPassManager::RenderBinEventSignal& RenderPassManager::getRenderBinSignal()
void RenderPassManager::initPersistFields()
{
Parent::initPersistFields();
}
RenderPassManager::RenderPassManager()

2
Engine/source/renderInstance/renderPrePassMgr.cpp
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;
}