[Bf-blender-cvs] [cd6daea7d32] blender2.8: Missed in last merge

Campbell Barton noreply at git.blender.org
Tue Apr 3 18:23:02 CEST 2018


Commit: cd6daea7d32d306a427e97427cb135d1589cc309
Author: Campbell Barton
Date:   Tue Apr 3 18:22:52 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBcd6daea7d32d306a427e97427cb135d1589cc309

Missed in last merge

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

M	source/blender/alembic/intern/alembic_capi.cc

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

diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 5e93779b5f6..3221ebe7778 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -843,7 +843,7 @@ static void import_endjob(void *user_data)
 
 		lc = BKE_layer_collection_get_active(view_layer);
 		if (lc == NULL) {
-			BLI_assert(BLI_listbase_count_ex(&view_layer->layer_collections, 1) == 0);
+			BLI_assert(BLI_listbase_count_at_most(&view_layer->layer_collections, 1) == 0);
 			/* when there is no collection linked to this ViewLayer, create one */
 			SceneCollection *sc = BKE_collection_add(&data->scene->id, NULL, COLLECTION_TYPE_NONE, NULL);
 			lc = BKE_collection_link(view_layer, sc);



More information about the Bf-blender-cvs mailing list