diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-26 09:23:47 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-26 09:23:47 -0700 |
| commit | badb8a945d31aed6f396e7efb521e76083870069 (patch) | |
| tree | fc95ced8519d1560c477e07acfd1fd13dfc043ac /indra | |
| parent | c56b410bdb3f58d5e058cd1f0e884bfcfee004c5 (diff) | |
NORSPEC-259 revive fix stomped with materials->bear merge
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llrender/llrendertarget.cpp | 4 | ||||
| -rwxr-xr-x | indra/newview/llviewershadermgr.cpp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp index d7f141bd92..353e61105a 100755 --- a/indra/llrender/llrendertarget.cpp +++ b/indra/llrender/llrendertarget.cpp @@ -583,8 +583,10 @@ void LLRenderTarget::copyContentsToFramebuffer(LLRenderTarget& source, S32 srcX0 { if (!source.mFBO) { - llerrs << "Cannot copy framebuffer contents for non FBO render targets." << llendl; + llwarns << "Cannot copy framebuffer contents for non FBO render targets." << llendl; + return; } + { GLboolean write_depth = mask & GL_DEPTH_BUFFER_BIT ? TRUE : FALSE; diff --git a/indra/newview/llviewershadermgr.cpp b/indra/newview/llviewershadermgr.cpp index 0e099b8299..50f0a5f1af 100755 --- a/indra/newview/llviewershadermgr.cpp +++ b/indra/newview/llviewershadermgr.cpp @@ -314,7 +314,6 @@ LLViewerShaderMgr::LLViewerShaderMgr() : mShaderList.push_back(&gDeferredMaterialWaterProgram[9+LLMaterial::SHADER_COUNT]); mShaderList.push_back(&gDeferredMaterialWaterProgram[13+LLMaterial::SHADER_COUNT]); mShaderList.push_back(&gDeferredAlphaProgram); - mShaderList.push_back(&gDeferredAlphaProgram); mShaderList.push_back(&gDeferredAlphaImpostorProgram); mShaderList.push_back(&gDeferredAlphaWaterProgram); mShaderList.push_back(&gDeferredSkinnedAlphaProgram); |