[Bf-blender-cvs] [152c965b75f] master: Fix T60263: render layer node sockets not showing on file load, for some files.

[Brecht Van Lommel]

Commit: 152c965b75f3ccc3b50301555cb9b1a2ee679193
Author: Brecht Van Lommel
Date:   Tue Jan 8 13:21:39 2019 +0100
Branches: master
https://developer.blender.org/rB152c965b75f3ccc3b50301555cb9b1a2ee679193

Fix T60263: render layer node sockets not showing on file load, for some files.

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

M	source/blender/render/intern/source/external_engine.c

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

diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c
index 758600e89aa..283f4c414ee 100644
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@ -812,8 +812,10 @@ void RE_engine_register_pass(struct RenderEngine *engine, struct Scene *scene, s
 	 * and check whether their nodetree has a node that needs to be updated. */
 	/* NOTE: using G_MAIN seems valid here,
 	 * unless we want to register that for every other temp Main we could generate??? */
+	ntreeCompositRegisterPass(scene->nodetree, scene, view_layer, name, type);
+
 	for (Scene *sce = G_MAIN->scene.first; sce; sce = sce->id.next) {
-		if (sce->nodetree) {
+		if (sce->nodetree && sce != scene) {
 			ntreeCompositRegisterPass(sce->nodetree, scene, view_layer, name, type);
 		}
 	}