diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-09-24 22:56:33 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-09-24 22:56:33 -0500 |
| commit | 102f600d3ae5427be0e338ae291d2f803436cd32 (patch) | |
| tree | b265ab7a7abbaea3b645958e37a80d7fd7ca69f5 | |
| parent | c70026499afccc2730119ae3c7abc7ab971170ea (diff) | |
SH-2244 Fix for bump surfaces appearing black when L&S disabled
| -rw-r--r-- | indra/llrender/llrender.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewershadermgr.cpp | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp index 685334555a..13e7c6094c 100644 --- a/indra/llrender/llrender.cpp +++ b/indra/llrender/llrender.cpp @@ -1039,6 +1039,7 @@ LLRender::LLRender() mMatIdx[i] = 0; mMatHash[i] = 0; mCurMatHash[i] = 0xFFFFFFFF; + mMatrix[i][0].make_identity(); } mLightHash = 0; diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index b0d97ee5f6..17cce3069e 100644 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -2122,6 +2122,14 @@ BOOL LLViewerShaderMgr::loadShadersObject() gObjectBumpProgram.mShaderFiles.push_back(make_pair("objects/bumpF.glsl", GL_FRAGMENT_SHADER_ARB)); gObjectBumpProgram.mShaderLevel = mVertexShaderLevel[SHADER_OBJECT]; success = gObjectBumpProgram.createShader(NULL, NULL); + + if (success) + { //lldrawpoolbump assumes "texture0" has channel 0 and "texture1" has channel 1 + gObjectBumpProgram.bind(); + gObjectBumpProgram.uniform1i("texture0", 0); + gObjectBumpProgram.uniform1i("texture1", 1); + gObjectBumpProgram.unbind(); + } } |