Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2021-04-12 10:18:40 +0300
committerJeroen Bakker <jeroen@blender.org>2021-04-12 10:50:04 +0300
commit75642b4cfd654b97e8096b97add58c4afa218413 (patch)
treec8b11325f125ada8bce1be18228ce1a278c5607e /source/blender/compositor/nodes/COM_OutputFileNode.h
parent175c1382da4d0079209d6e2adedc7c408f327a21 (diff)
Fix T87252: File output node broken with more than 4 inputs.
In recent refactor the operator sockets were migrated from a std::list to a blender::Vector. The way how the file output node created the sockets along mapping the sockets could lead to storing incorrect pointers. This patch fixes this by defining and mapping the sockets in separate loops.
Diffstat (limited to 'source/blender/compositor/nodes/COM_OutputFileNode.h')
-rw-r--r--source/blender/compositor/nodes/COM_OutputFileNode.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/compositor/nodes/COM_OutputFileNode.h b/source/blender/compositor/nodes/COM_OutputFileNode.h
index d1826797c6e..c64128a708f 100644
--- a/source/blender/compositor/nodes/COM_OutputFileNode.h
+++ b/source/blender/compositor/nodes/COM_OutputFileNode.h
@@ -19,6 +19,9 @@
#pragma once
#include "COM_Node.h"
+
+#include "COM_OutputFileMultiViewOperation.h"
+
#include "DNA_node_types.h"
namespace blender::compositor {
@@ -32,6 +35,11 @@ class OutputFileNode : public Node {
OutputFileNode(bNode *editorNode);
void convertToOperations(NodeConverter &converter,
const CompositorContext &context) const override;
+
+ private:
+ void add_input_sockets(OutputOpenExrMultiLayerOperation &operation) const;
+ void map_input_sockets(NodeConverter &converter,
+ OutputOpenExrMultiLayerOperation &operation) const;
};
} // namespace blender::compositor