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

Merge pull request #158 from DavidWyand-GG/issue124-RevertMaterialChanges

Browse source 
Partial revert of changes from Pull #125
This commit is contained in:
David Wyand 2012-11-26 08:39:03 -08:00
commit a98dfb9218
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: