diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-11 18:41:52 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-11 18:41:52 +0000 |
| commit | fe28c3e886aa8a9d5c5b9bc582b532f1235bd76c (patch) | |
| tree | 9eb0310081f3c8ea2b302fcf0fe2fc76a3683e5d /indra/llrender/llrender.cpp | |
| parent | 43c8f5959f8afaf2f67fbbf49e78965802859b55 (diff) | |
| parent | 1207c2fd006842a86e4ecf45bf653dc54081db1b (diff) | |
Merged in graham_linden/viewer-eep-graham (pull request #77)
SL-1936 and SL-1912 WIP
Diffstat (limited to 'indra/llrender/llrender.cpp')
| -rw-r--r-- | indra/llrender/llrender.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 67898f1258..251c02dd77 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1241,16 +1241,10 @@ void LLRender::syncMatrices() } if (shader->getUniformLocation(LLShaderMgr::INVERSE_MODELVIEW_MATRIX)) - { - glh::matrix4f ogl_to_cfr = copy_matrix((F32*)OGL_TO_CFR_ROTATION); - glh::matrix4f modelview = ogl_to_cfr.inverse() * get_current_modelview(); - - glh::matrix4f inv_modelview = modelview.inverse(); - shader->uniformMatrix4fv(LLShaderMgr::INVERSE_MODELVIEW_MATRIX, 1, FALSE, inv_modelview.m); + { + shader->uniformMatrix4fv(LLShaderMgr::INVERSE_MODELVIEW_MATRIX, 1, GL_FALSE, cached_inv_mdv.m); } - shader->uniformMatrix4fv(LLShaderMgr::INVERSE_MODELVIEW_MATRIX, 1, GL_FALSE, cached_inv_mdv.m); - //update MVP matrix mvp_done = true; loc = shader->getUniformLocation(LLShaderMgr::MODELVIEW_PROJECTION_MATRIX); |