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:
authorLukas Toenne <lukas.toenne@googlemail.com>2013-10-16 11:55:52 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2013-10-16 11:55:52 +0400
commit78efff5f4251f1f4cf0ae3cd60d84ac5f78e332a (patch)
tree1eec8eea29ae8734ab1f5498b8c80a3591628819 /source/blender/compositor
parent089d0ad8f9d227b3cadd56184578e163ac5589f8 (diff)
Fix #37084, Backdrop not invalidating inside node groups.
Extended the is_active_group flag such that both the current edittree as well as the base node tree in Scene do a viewer node update.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
index 9516deee7e3..3f8c432a004 100644
--- a/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
+++ b/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
@@ -45,7 +45,10 @@ void ExecutionSystemHelper::addbNodeTree(ExecutionSystem &system, int nodes_star
vector<Node *>& nodes = system.getNodes();
vector<SocketConnection *>& links = system.getConnections();
- bool is_active_group = (parent_key.value == system.getContext().getbNodeTree()->active_viewer_key.value);
+ const bNodeTree *basetree = system.getContext().getbNodeTree();
+ /* update viewers in the active edittree as well the base tree (for backdrop) */
+ bool is_active_group = (parent_key.value == basetree->active_viewer_key.value
+ || tree == basetree);
/* add all nodes of the tree to the node list */
bNode *node = (bNode *)tree->nodes.first;