Skip to content
Snippets Groups Projects
Commit 4709ca96 authored by Graham Linden's avatar Graham Linden
Browse files

NORSPEC-259 revive fix stomped with materials->bear merge

parent 05c6d59f
Branches
Tags
No related merge requests found
...@@ -583,8 +583,10 @@ void LLRenderTarget::copyContentsToFramebuffer(LLRenderTarget& source, S32 srcX0 ...@@ -583,8 +583,10 @@ void LLRenderTarget::copyContentsToFramebuffer(LLRenderTarget& source, S32 srcX0
{ {
if (!source.mFBO) 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; GLboolean write_depth = mask & GL_DEPTH_BUFFER_BIT ? TRUE : FALSE;
......
...@@ -314,7 +314,6 @@ LLViewerShaderMgr::LLViewerShaderMgr() : ...@@ -314,7 +314,6 @@ LLViewerShaderMgr::LLViewerShaderMgr() :
mShaderList.push_back(&gDeferredMaterialWaterProgram[9+LLMaterial::SHADER_COUNT]); mShaderList.push_back(&gDeferredMaterialWaterProgram[9+LLMaterial::SHADER_COUNT]);
mShaderList.push_back(&gDeferredMaterialWaterProgram[13+LLMaterial::SHADER_COUNT]); mShaderList.push_back(&gDeferredMaterialWaterProgram[13+LLMaterial::SHADER_COUNT]);
mShaderList.push_back(&gDeferredAlphaProgram); mShaderList.push_back(&gDeferredAlphaProgram);
mShaderList.push_back(&gDeferredAlphaProgram);
mShaderList.push_back(&gDeferredAlphaImpostorProgram); mShaderList.push_back(&gDeferredAlphaImpostorProgram);
mShaderList.push_back(&gDeferredAlphaWaterProgram); mShaderList.push_back(&gDeferredAlphaWaterProgram);
mShaderList.push_back(&gDeferredSkinnedAlphaProgram); mShaderList.push_back(&gDeferredSkinnedAlphaProgram);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment