diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-17 02:36:43 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-17 02:36:43 -0500 |
| commit | 421e52ff98b67398843482713d754678a7153f50 (patch) | |
| tree | 648268fadd4d62d5a9822c022a117913d0603a17 /indra/llrender/llcubemap.cpp | |
| parent | 0c2876ef2c9c9b5e739329de9a2c261185b094f1 (diff) | |
SH-2243 work in progress -- gDEBugger guided removal of deprecated state changes
Diffstat (limited to 'indra/llrender/llcubemap.cpp')
| -rw-r--r-- | indra/llrender/llcubemap.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/llrender/llcubemap.cpp b/indra/llrender/llcubemap.cpp index 5eb29efbfa..a75f01c708 100644 --- a/indra/llrender/llcubemap.cpp +++ b/indra/llrender/llcubemap.cpp @@ -36,6 +36,7 @@ #include "m4math.h" #include "llrender.h" +#include "llglslshader.h" #include "llglheaders.h" @@ -195,7 +196,7 @@ void LLCubeMap::enableTexture(S32 stage) void LLCubeMap::enableTextureCoords(S32 stage) { mTextureCoordStage = stage; - if (gGLManager.mHasCubeMap && stage >= 0 && LLCubeMap::sUseCubeMaps) + if (!LLGLSLShader::sNoFixedFunction && gGLManager.mHasCubeMap && stage >= 0 && LLCubeMap::sUseCubeMaps) { if (stage > 0) { @@ -237,7 +238,7 @@ void LLCubeMap::disableTexture(void) void LLCubeMap::disableTextureCoords(void) { - if (gGLManager.mHasCubeMap && mTextureCoordStage >= 0 && LLCubeMap::sUseCubeMaps) + if (!LLGLSLShader::sNoFixedFunction && gGLManager.mHasCubeMap && mTextureCoordStage >= 0 && LLCubeMap::sUseCubeMaps) { if (mTextureCoordStage > 0) { |