livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-14113: Fix remote merge conflict

meow-7.2.2
Ptolemy 2021-04-29 14:20:04 -07:00
parent d3c439b374 22f67f9913
commit 8fc6fcc0a6
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llviewershadermgr.cpp
View File

@ -1078,7 +1078,6 @@ BOOL LLViewerShaderMgr::loadShadersEnvironment()
gMoonProgram.addConstant( LLGLSLShader::SHADER_CONST_CLOUD_MOON_DEPTH ); // SL-14113
success = gMoonProgram.createShader(NULL, NULL);
if (success)
{
gMoonProgram.bind();
gMoonProgram.uniform1i(sTex0, 0);