[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59964] trunk/blender/source/blender/ compositor/nodes/COM_SplitViewerNode.cpp: Fix #36692: crash with split viewer compositing node and rendering.

[Brecht Van Lommel]

Revision: 59964
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59964
Author:   blendix
Date:     2013-09-09 18:00:25 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Fix #36692: crash with split viewer compositing node and rendering. Only one viewer
node should write to the viewer image, the logic to check this was wrong, now made
it the same as the viewer node.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp

Modified: trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp	2013-09-09 17:26:09 UTC (rev 59963)
+++ trunk/blender/source/blender/compositor/nodes/COM_SplitViewerNode.cpp	2013-09-09 18:00:25 UTC (rev 59964)
@@ -35,9 +35,8 @@
 void SplitViewerNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
 {
 	bNode *editorNode = this->getbNode();
-	bool is_active = ((editorNode->flag & NODE_DO_OUTPUT_RECALC) &&
-	                  (editorNode->flag & NODE_DO_OUTPUT) && this->isInActiveGroup()) ||
-	                 context->isRendering();
+	bool is_active = ((editorNode->flag & NODE_DO_OUTPUT_RECALC || context->isRendering()) &&
+	                  (editorNode->flag & NODE_DO_OUTPUT) && this->isInActiveGroup());
 
 	InputSocket *image1Socket = this->getInputSocket(0);
 	InputSocket *image2Socket = this->getInputSocket(1);