[Bf-blender-cvs] [9c20de8998a] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 9c20de8998ac8fbbe9c48de250380b1ffc39b845
Author: Bastien Montagne
Date:   Tue Jun 19 19:25:44 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9c20de8998ac8fbbe9c48de250380b1ffc39b845

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/render/intern/source/external_engine.c
index 6e4336f80ea,765bb435525..7a9be04d8f6
--- a/source/blender/render/intern/source/external_engine.c
+++ b/source/blender/render/intern/source/external_engine.c
@@@ -797,10 -790,11 +797,11 @@@ void RE_engine_register_pass(struct Ren
  	/* Register the pass in all scenes that have a render layer node for this layer.
  	 * Since multiple scenes can be used in the compositor, the code must loop over all scenes
  	 * and check whether their nodetree has a node that needs to be updated. */
- 	Scene *sce;
- 	for (sce = G.main->scene.first; sce; sce = sce->id.next) {
+ 	/* NOTE: using G_MAIN seems valid here,
+ 	 * unless we want to register that for every other temp Main we could generate??? */
+ 	for (Scene *sce = G_MAIN->scene.first; sce; sce = sce->id.next) {
  		if (sce->nodetree) {
 -			ntreeCompositRegisterPass(sce->nodetree, scene, srl, name, type);
 +			ntreeCompositRegisterPass(sce->nodetree, scene, view_layer, name, type);
  		}
  	}
  }