[Bf-blender-cvs] [b22587f757] temp-depsgraph-layers: Make sure newly added objects follow layer collection evaluated flag

Dalai Felinto noreply at git.blender.org
Wed Mar 22 15:38:49 CET 2017


Commit: b22587f757b555ec4409c8a8397086501110d088
Author: Dalai Felinto
Date:   Tue Mar 21 11:36:00 2017 +0100
Branches: temp-depsgraph-layers
https://developer.blender.org/rBb22587f757b555ec4409c8a8397086501110d088

Make sure newly added objects follow layer collection evaluated flag

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

M	source/blender/blenkernel/intern/layer.c

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 2512c34f70..f401a63140 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -820,6 +820,14 @@ static void layer_collection_object_add(SceneLayer *sl, LayerCollection *lc, Obj
 
 	BLI_addtail(&lc->object_bases, BLI_genericNodeN(base));
 
+	if ((lc->flag_evaluated & COLLECTION_VISIBLE) != 0) {
+		base->flag |= BASE_VISIBLED;
+	}
+
+	if ((lc->flag_evaluated & COLLECTION_SELECTABLE) != 0) {
+		base->flag |= BASE_SELECTABLED;
+	}
+
 	BKE_scene_layer_engine_settings_object_recalculate(sl, ob);
 }




More information about the Bf-blender-cvs mailing list