tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

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.
This commit is contained in:
Brecht Van Lommel 2013-09-09 18:00:25 +00:00
parent d638c4c064
commit 97d250fa65
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/compositor/nodes/COM_SplitViewerNode.cpp
View File

@ -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);