summaryrefslogtreecommitdiff
path: root/indra/llrender/llshadermgr.cpp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2024-05-02 10:59:29 -0500
committerGitHub <noreply@github.com>2024-05-02 10:59:29 -0500
commite8219cb0509d5aacc75cf862c6b8cad026590958 (patch)
treebfd85d36db258f46b74aa9989c1615d9bd7faf72 /indra/llrender/llshadermgr.cpp
parenta701cce8e0959503156a010683f6d0d57beaae36 (diff)
parent7fc5f7e649c564fa8479a72a45459d0cc427d0f8 (diff)
Merge branch 'project/gltf_development' into 1357-gltf-asset-prototype
Diffstat (limited to 'indra/llrender/llshadermgr.cpp')
-rw-r--r--indra/llrender/llshadermgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llshadermgr.cpp b/indra/llrender/llshadermgr.cpp
index 0b20ff6230..636e13719a 100644
--- a/indra/llrender/llshadermgr.cpp
+++ b/indra/llrender/llshadermgr.cpp
@@ -328,7 +328,7 @@ BOOL LLShaderMgr::attachShaderFeatures(LLGLSLShader * shader)
return FALSE;
}
}
- shader->mFeatures.mIndexedTextureChannels = llmax(LLGLSLShader::sIndexedTextureChannels-1, 1);
+ shader->mFeatures.mIndexedTextureChannels = llmax(LLGLSLShader::sIndexedTextureChannels, 1);
}
}