diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-09 22:00:25 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-09 22:00:25 +0400 |
| commit | 97d250fa65bd0472e61fa8cab23cfdce0422a9ba (patch) | |
| tree | ad1e9c1ae8e4334761e61cfa255ed639496c9e99 /source/blender/compositor/nodes | |
| parent | d638c4c0645967fb2794919fe04d61a79f8e9972 (diff) | |
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.
Diffstat (limited to 'source/blender/compositor/nodes')
| -rw-r--r-- | source/blender/compositor/nodes/COM_SplitViewerNode.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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); |