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 Tönne <lukas.toenne@gmail.com>2014-04-02 12:59:35 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-04-02 13:04:09 +0400
commit288147334ce81cf0be533c15f3698b88ef7c63f3 (patch)
tree65326991ac0024dc054c2007209f9efd6e33a3ef /source/blender/nodes
parenteed3974d11af6072174a43f6b103c9b64be054e2 (diff)
Fix T39547: Toggling render passes on active scene does not update
render layer nodes in a pinned tree from different scene. The way these updates work is a nasty legacy hack: https://developer.blender.org/diffusion/B/browse/master/source/blender/nodes/composite/node_composite_tree.c$277 This function is called //very frequently// by the get_from_context method. However, this does not get called for pinned node trees, so when showing a different scene's compositing nodes in the editor they may not get updated correctly. Now moved this update call out of get_from_context so it happens in any case. Will be called no more frequently than before (on every redraw). Eventually the depsgraph should handle this more precisely, it's just a simple ID dependency anyway ...
Diffstat (limited to 'source/blender/nodes')
-rw-r--r--source/blender/nodes/composite/node_composite_tree.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/nodes/composite/node_composite_tree.c b/source/blender/nodes/composite/node_composite_tree.c
index f3a99d9184e..a1bc369fd94 100644
--- a/source/blender/nodes/composite/node_composite_tree.c
+++ b/source/blender/nodes/composite/node_composite_tree.c
@@ -72,10 +72,6 @@ static void composite_get_from_context(const bContext *C, bNodeTreeType *UNUSED(
*r_from = NULL;
*r_id = &scene->id;
*r_ntree = scene->nodetree;
-
- /* update output sockets based on available layers */
- ntreeCompositForceHidden(scene->nodetree);
-
}
static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func)