TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partial revert of changes from Pull #125

Browse source 
Pull Request #125 was to fix Issue #124.  However, as reported by a
user, this fix broke the water.  This is a partial reversion of those
changes to get the water working again.  The fix from Pull #125 will
need to be examined.
This commit is contained in:
DavidWyand-GG 2012-11-26 11:37:55 -05:00
parent 70b95d6d49
commit 4a11d54609
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Engine/source/materials/processedCustomMaterial.cpp
View file

@ -347,13 +347,14 @@ void ProcessedCustomMaterial::setTextureStages( SceneRenderState *state, const S
} }
case Material::BackBuff: case Material::BackBuff:
{ {
if ( sgData.reflectTex ) GFX->setTexture( samplerRegister, sgData.backBuffTex );
GFX->setTexture( samplerRegister, sgData.reflectTex ); //if ( sgData.reflectTex )
else // GFX->setTexture( samplerRegister, sgData.reflectTex );
{ //else
GFXTextureObject *refractTex = REFLECTMGR->getRefractTex( true ); //{
GFX->setTexture( samplerRegister, refractTex ); // GFXTextureObject *refractTex = REFLECTMGR->getRefractTex( true );
} // GFX->setTexture( samplerRegister, refractTex );
//}
break; break;
} }
case Material::ReflectBuff: case Material::ReflectBuff: