[Bf-blender-cvs] [98b2d9fe9b5] temp-group-collections: Remove assert from BKE_layer_collection_get_active_ensure

Dalai Felinto noreply at git.blender.org
Wed Nov 1 18:14:53 CET 2017


Commit: 98b2d9fe9b5f6ad5c9fc15e15f7da4ee47df6c23
Author: Dalai Felinto
Date:   Mon Oct 30 20:09:29 2017 -0200
Branches: temp-group-collections
https://developer.blender.org/rB98b2d9fe9b5f6ad5c9fc15e15f7da4ee47df6c23

Remove assert from BKE_layer_collection_get_active_ensure

If all collections are group collections, we still need to create a
ew collection to accomodate new objects.

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

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

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

diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index e2c8f7e2233..d2962a66773 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -531,7 +531,6 @@ LayerCollection *BKE_layer_collection_get_active_ensure(Scene *scene, SceneLayer
 	LayerCollection *lc = BKE_layer_collection_get_active(sl);
 
 	if (lc == NULL) {
-		BLI_assert(BLI_listbase_is_empty(&sl->layer_collections));
 		/* When there is no collection linked to this SceneLayer, create one. */
 		SceneCollection *sc = BKE_collection_add(&scene->id, NULL, COLLECTION_TYPE_NONE, NULL);
 		lc = BKE_collection_link(sl, sc);



More information about the Bf-blender-cvs mailing list