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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-05-08 16:57:20 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-05-08 18:46:20 +0300
commite6d11c6ce66f94549d1fe896c59b67564ae19d68 (patch)
treebabe12f8b03d92d1a43d880e044bca2394ecd118 /source/blender/blenkernel/intern/object_update.c
parent03dd109a84657ebf778dc3c25776f7a93cccf1ac (diff)
Collections: remove per collection and view layer engine overrides.
This will be handled by the new view layer override system which will store data elsewhere, removing the code already for easier refactoring.
Diffstat (limited to 'source/blender/blenkernel/intern/object_update.c')
-rw-r--r--source/blender/blenkernel/intern/object_update.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 3f83778922e..68cc0ed9ec1 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -459,18 +459,10 @@ void BKE_object_eval_flush_base_flags(Depsgraph *depsgraph,
DEG_debug_print_eval(depsgraph, __func__, object->id.name, object);
- /* 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 DEG_id_tag_update(id, DEG_TAG_BASE_FLAGS_UPDATE).
- * Either of the entire scene, or of the newly added objects.*/
- BLI_assert(!BLI_listbase_is_empty(&base->collection_properties->data.group));
-
/* Copy flags and settings from base. */
object->base_flag = base->flag;
if (is_from_set) {
object->base_flag |= BASE_FROM_SET;
object->base_flag &= ~(BASE_SELECTED | BASE_SELECTABLED);
}
- object->base_collection_properties = base->collection_properties;
}