Merge branch 'master' into blender2.8

2017-05-03 18:33:02 +02:00
parent 2564d929fc 15189baa52
commit 82e242cc72
91 changed files with 2844 additions and 2182 deletions
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -191,8 +191,12 @@ void ED_render_engine_changed(Main *bmain)

 	RE_FreePersistentData();

-	for (scene = bmain->scene.first; scene; scene = scene->id.next)
+	for (scene = bmain->scene.first; scene; scene = scene->id.next) {
 		ED_render_id_flush_update(bmain, &scene->id);
+		if (scene->nodetree) {
+			ntreeCompositUpdateRLayers(scene->nodetree);
+		}
+	}
 }

 /***************************** Updates ***********************************