[Bf-blender-cvs] [888427cabbf] blender-v2.83-release: Fix T76780: Freestyle pass for one scene not accessible in compositor in other scenes

Jeroen Bakker noreply at git.blender.org
Tue May 19 08:25:36 CEST 2020


Commit: 888427cabbf4f218890cf908a135c1f527fe8a49
Author: Jeroen Bakker
Date:   Mon May 18 15:06:03 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB888427cabbf4f218890cf908a135c1f527fe8a49

Fix T76780: Freestyle pass for one scene not accessible in compositor in other scenes

Current implementation would update the nodetree of the freestyle scene not the composite scene.

Reviewed By: Dalai Felinto

Differential Revision: https://developer.blender.org/D7770

===================================================================

M	source/blender/nodes/composite/nodes/node_composite_image.c

===================================================================

diff --git a/source/blender/nodes/composite/nodes/node_composite_image.c b/source/blender/nodes/composite/nodes/node_composite_image.c
index 382459993b7..53ea02ff8a7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_image.c
+++ b/source/blender/nodes/composite/nodes/node_composite_image.c
@@ -311,8 +311,7 @@ static void cmp_node_rlayer_create_outputs(bNodeTree *ntree,
 
         if ((scene->r.mode & R_EDGE_FRS) &&
             (view_layer->freestyle_config.flags & FREESTYLE_AS_RENDER_PASS)) {
-          ntreeCompositRegisterPass(
-              scene->nodetree, scene, view_layer, RE_PASSNAME_FREESTYLE, SOCK_RGBA);
+          ntreeCompositRegisterPass(ntree, scene, view_layer, RE_PASSNAME_FREESTYLE, SOCK_RGBA);
         }
 
         MEM_freeN(data);



More information about the Bf-blender-cvs mailing list