From b25cce1430a6eec6cf7a784586c164c8562ef2ef Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 25 Sep 2012 13:02:52 +0000 Subject: Compositor: * Node muting in node groups didn't work. [#32597] Mute one node in a group blocks it It looked for connections in the main tree, and not inside the group. --- source/blender/compositor/intern/COM_Node.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'source/blender/compositor/intern/COM_Node.h') diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h index bfccd069ad1..e8fd936e749 100644 --- a/source/blender/compositor/intern/COM_Node.h +++ b/source/blender/compositor/intern/COM_Node.h @@ -53,6 +53,12 @@ private: * @brief Is this node part of the active group */ bool m_inActiveGroup; + + /** + * @brief The group node this node belongs to. + * @note: used to find the links in the current subtree for muting nodes + */ + bNode* m_bNodeGroup; public: Node(bNode *editorNode, bool create_sockets = true); @@ -134,6 +140,9 @@ public: * @param socket */ OutputSocket *findOutputSocketBybNodeSocket(bNodeSocket *socket); + + inline void setbNodeGroup(bNode* group) {this->m_bNodeGroup = group;} + inline bNode* getbNodeGroup() {return this->m_bNodeGroup;} protected: void addPreviewOperation(ExecutionSystem *system, CompositorContext *context, InputSocket *inputSocket); void addPreviewOperation(ExecutionSystem *system, CompositorContext *context, OutputSocket *outputSocket); -- cgit v1.2.3