From 97d250fa65bd0472e61fa8cab23cfdce0422a9ba Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 9 Sep 2013 18:00:25 +0000 Subject: 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. --- source/blender/compositor/nodes/COM_SplitViewerNode.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/blender/compositor/nodes') diff --git a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp index 81c0744564f..6fb8467674b 100644 --- a/source/blender/compositor/nodes/COM_SplitViewerNode.cpp +++ b/source/blender/compositor/nodes/COM_SplitViewerNode.cpp @@ -35,9 +35,8 @@ SplitViewerNode::SplitViewerNode(bNode *editorNode) : Node(editorNode) 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); -- cgit v1.2.3