diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-29 17:13:11 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 17:13:11 -0600 |
| commit | 45d3e147aca316df59506053c4de5f4239287ee7 (patch) | |
| tree | 749b27ded8b9d114031e728793d3950645d14715 /indra/newview/pipeline.cpp | |
| parent | 893b5e16b81ead08ef22b03594e0a835df525778 (diff) | |
SH-1912 Add environment map back into shiny when lighting and shadows enabled.
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 12bec90881..657cdc0e07 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -7108,13 +7108,12 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, U32 light_index, U32 n cube_map->enable(channel); cube_map->bind(); F32* m = gGLModelView; - - + F32 mat[] = { m[0], m[1], m[2], m[4], m[5], m[6], m[8], m[9], m[10] }; - shader.uniform3fv(LLShaderMgr::DEFERRED_ENV_MAT, 3, mat); + shader.uniformMatrix3fv(LLShaderMgr::DEFERRED_ENV_MAT, 1, TRUE, mat); } } |