[Bf-blender-cvs] [fdeb125c7a8] blender2.8: Fix T53014: Cycles material preview not working

Dalai Felinto noreply at git.blender.org
Mon Oct 9 16:44:27 CEST 2017


Commit: fdeb125c7a8c9f14369182901648760edc005968
Author: Dalai Felinto
Date:   Mon Oct 9 11:41:14 2017 -0300
Branches: blender2.8
https://developer.blender.org/rBfdeb125c7a8c9f14369182901648760edc005968

Fix T53014: Cycles material preview not working

This was introduced on 9ad2c0b6154 and partly mended on 8a1d787b89.

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

M	source/blender/editors/render/render_preview.c

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

diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 1261ff43854..3f817672c00 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -308,12 +308,14 @@ static void set_preview_layer(SceneLayer *scene_layer, char pr_type)
 {
 	LayerCollection *lc;
 	const char *collection_name = preview_layer_name(pr_type);
+
 	for (lc = scene_layer->layer_collections.first; lc; lc = lc->next) {
 		if (STREQ(lc->scene_collection->name, collection_name)) {
-			lc->flag = COLLECTION_VISIBLE;
+			lc->flag = COLLECTION_VISIBLE | COLLECTION_DISABLED;
+			BKE_collection_enable(scene_layer, lc);
 		}
 		else {
-			lc->flag = COLLECTION_DISABLED;
+			BKE_collection_disable(scene_layer, lc);
 		}
 	}
 }



More information about the Bf-blender-cvs mailing list