From 288147334ce81cf0be533c15f3698b88ef7c63f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Wed, 2 Apr 2014 10:59:35 +0200 Subject: 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 ... --- source/blender/nodes/composite/node_composite_tree.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source/blender/nodes') 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) -- cgit v1.2.3