From 0c6227ce7770c53d8306b21d682e9c3d68573855 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 24 May 2017 19:07:07 +0200 Subject: Depsgraph iterator: Add assert for bases not yet evaluated --- source/blender/depsgraph/intern/depsgraph_query.cc | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source') diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index 860e0dd80a0..b6c71524eca 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -134,6 +134,11 @@ void DEG_objects_iterator_next(BLI_Iterator *iter) Object *ob = DEG_get_object(data->graph, base->object); iter->current = ob; + /* Make sure we have the base collection settings is already populated. + * This will fail when BKE_layer_eval_layer_collection_pre hasn't run yet + * Which usually means a missing call to DAG_id_tag_update(). */ + BLI_assert(!BLI_listbase_is_empty(&base->collection_properties->data.group)); + /* Flushing depsgraph data. */ ob->base_flag = (base->flag | BASE_FROM_SET) & data->flag; ob->base_collection_properties = base->collection_properties; -- cgit v1.2.3