From 4a11d5460903e3af7c169a7a54b20abf34cdab23 Mon Sep 17 00:00:00 2001 From: DavidWyand-GG Date: Mon, 26 Nov 2012 11:37:55 -0500 Subject: [PATCH] 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. --- .../source/materials/processedCustomMaterial.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Engine/source/materials/processedCustomMaterial.cpp b/Engine/source/materials/processedCustomMaterial.cpp index decace478..513ead314 100644 --- a/Engine/source/materials/processedCustomMaterial.cpp +++ b/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: