diff options
author | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-09-19 12:21:53 +0400 |
---|---|---|
committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2013-09-19 12:21:53 +0400 |
commit | c628c4b45b8b0a5e1d0eff11a0be7d456ea2f0a7 (patch) | |
tree | 53ff3fc4a55f2615752138a77a5b36bae3df9a89 /source/blender/compositor/nodes/COM_OutputFileNode.cpp | |
parent | 1ca5de1b51fb57deee02bc65d681f6245103e74b (diff) |
Fix for OutputFile node, this would crash with unconnected sockets in MultiEXR mode, because it matches sockets and EXR layers by index and was skipping unconnected sockets. Simply create EXR layer info
for all sockets now and then ignore unconnected layers when finally writing to file in deinitExecution.
Diffstat (limited to 'source/blender/compositor/nodes/COM_OutputFileNode.cpp')
-rw-r--r-- | source/blender/compositor/nodes/COM_OutputFileNode.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.cpp b/source/blender/compositor/nodes/COM_OutputFileNode.cpp index 3b1871b307b..94e5efe77e0 100644 --- a/source/blender/compositor/nodes/COM_OutputFileNode.cpp +++ b/source/blender/compositor/nodes/COM_OutputFileNode.cpp @@ -59,12 +59,12 @@ void OutputFileNode::convertToOperations(ExecutionSystem *graph, CompositorConte bool hasConnections = false; for (int i = 0; i < num_inputs; ++i) { InputSocket *input = getInputSocket(i); + NodeImageMultiFileSocket *sockdata = (NodeImageMultiFileSocket *)input->getbNodeSocket()->storage; + + outputOperation->add_layer(sockdata->layer, input->getDataType()); + if (input->isConnected()) { hasConnections = true; - NodeImageMultiFileSocket *sockdata = (NodeImageMultiFileSocket *)input->getbNodeSocket()->storage; - - outputOperation->add_layer(sockdata->layer, input->getDataType()); - input->relinkConnections(outputOperation->getInputSocket(i)); } } |