Browse Source

Partial revert of changes from Pull #125

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.
DavidWyand-GG 12 years ago
parent
commit
4a11d54609
1 changed files with 8 additions and 7 deletions
  1. 8 7
      Engine/source/materials/processedCustomMaterial.cpp

+ 8 - 7
Engine/source/materials/processedCustomMaterial.cpp

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