summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2018-06-29 20:15:10 +0100
committerGraham Linden <graham@lindenlab.com>2018-06-29 20:15:10 +0100
commitd5c465b4ab263e568761f6197534f7ddcda8a5ee (patch)
tree32796e9f7717a6ff48dcdf54e1aef4f1469d3793 /indra/llrender
parent1eda16b31989448a211808a8144f0a5ffb0bce49 (diff)
MAINT-8817 remove automatic update of inv_proj matrix so sunLightF which expects it not to match the projection mat works again
Fix misspellinging in missing settings asset notification string Fix moon quat conversion to get proper directional rotation Add early out so attempting to set parcel env settings doesn't crash
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llrender.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index c42d2799d7..67898f1258 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -1275,11 +1275,13 @@ void LLRender::syncMatrices()
{ //update projection matrix, normal, and MVP
glh::matrix4f& mat = mMatrix[MM_PROJECTION][mMatIdx[MM_PROJECTION]];
- if (shader->getUniformLocation(LLShaderMgr::INVERSE_PROJECTION_MATRIX))
- {
- glh::matrix4f inv_proj = mat.inverse();
- shader->uniformMatrix4fv(LLShaderMgr::INVERSE_PROJECTION_MATRIX, 1, FALSE, inv_proj.m);
- }
+ // it would be nice to have this automatically track the state of the proj matrix
+ // but certain render paths require it to be mismatched *sigh*
+ //if (shader->getUniformLocation(LLShaderMgr::INVERSE_PROJECTION_MATRIX))
+ //{
+ // glh::matrix4f inv_proj = mat.inverse();
+ // shader->uniformMatrix4fv(LLShaderMgr::INVERSE_PROJECTION_MATRIX, 1, FALSE, inv_proj.m);
+ //}
shader->uniformMatrix4fv(name[MM_PROJECTION], 1, GL_FALSE, mat.m);
shader->mMatHash[MM_PROJECTION] = mMatHash[MM_PROJECTION];