Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-05-24 20:07:07 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-05-26 18:44:00 +0300
commit0c6227ce7770c53d8306b21d682e9c3d68573855 (patch)
tree304957495dba515f26b5f904f19b43a47607ff99 /source/blender/depsgraph/intern
parent620516965b4943ab6c2b0e14e63ff725cf5d1611 (diff)
Depsgraph iterator: Add assert for bases not yet evaluated
Diffstat (limited to 'source/blender/depsgraph/intern')
-rw-r--r--source/blender/depsgraph/intern/depsgraph_query.cc5
1 files changed, 5 insertions, 0 deletions
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;