Commit: 8671b44fe52030424a9720735c9cfe8374349b48
Author: Campbell Barton
Date: Wed Jun 7 15:54:53 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB8671b44fe52030424a9720735c9cfe8374349b48
Merge branch '28' into custom-manipulators
===================================================================
===================================================================
diff --cc source/blender/depsgraph/intern/depsgraph_query.cc
index f1422953883,0661f24fb7b..b311d444529
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@@ -188,15 -202,17 +202,18 @@@ void DEG_objects_iterator_next(BLI_Iter
/* 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));
+ BLI_assert((base->collection_properties == NULL) ||
+
!BLI_listbase_is_empty(&base->collection_properties->data.group));
/* Flushing depsgraph data. */
- deg_flush_data(ob, base, data->base_flag);
+ deg_flush_base_flags_and_settings(ob,
+ base,
+ data->base_flag);
if ((data->flag & DEG_OBJECT_ITER_FLAG_DUPLI) &&
(ob->transflag & OB_DUPLI)) {
+ data->dupli_parent = ob;
data->dupli_list =
object_duplilist(data->eval_ctx, data->scene, ob);
- data->dupli_object = (DupliObject
*)data->dupli_list->first;
+ data->dupli_object_next = (DupliObject
*)data->dupli_list->first;
}
return;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
