From 4ccf89ba8e2b81ed81de83b8c606032af0d23e5d Mon Sep 17 00:00:00 2001 From: Anis Date: Wed, 21 Jan 2015 14:39:05 +0100 Subject: [PATCH] fix to avoid a missing sampler name declaration --- Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp index 114443822..82a5123ae 100644 --- a/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp +++ b/Engine/source/shaderGen/GLSL/shaderFeatureGLSL.cpp @@ -985,10 +985,9 @@ void DiffuseMapFeatGLSL::setTexData( Material::StageData &stageDat, RenderPassData &passData, U32 &texIndex ) { - passData.mSamplerNames[ texIndex ] = "diffuseMap"; GFXTextureObject *tex = stageDat.getTex( MFT_DiffuseMap ); - if ( tex ) - passData.mTexSlot[ texIndex++ ].texObject = tex; + passData.mSamplerNames[ texIndex ] = "diffuseMap"; + passData.mTexSlot[ texIndex++ ].texObject = tex; }