summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-06-24 19:28:02 -0700
committerGraham Linden <graham@lindenlab.com>2013-06-24 19:28:02 -0700
commitc07f47dee88db5e041648b38d92b173cce65aa9f (patch)
treeb2669734c896f3064429c28ada5351a52934016b
parent3a8cdb5d46cd12a5aad001e4bcec5b26f6f748ce (diff)
NORSPEC-259 nerfed copyContentsToFramebuffer handling of non-FBO sources
-rwxr-xr-xindra/llrender/llrendertarget.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llrender/llrendertarget.cpp b/indra/llrender/llrendertarget.cpp
index 6e22712b94..09ef780424 100755
--- a/indra/llrender/llrendertarget.cpp
+++ b/indra/llrender/llrendertarget.cpp
@@ -572,8 +572,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;