Prevent crash when duplicating object which doesn't have evaluated base properties yet

This mainly happens when copy on write is enabled.
This commit is contained in:
Sergey Sharybin
2017-07-27 16:29:45 +02:00
parent 03d258d613
commit 9323182e73

View File

@@ -260,6 +260,9 @@ void BKE_collection_object_add_from(Scene *scene, Object *ob_src, Object *ob_dst
for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
Base *base_src = BKE_scene_layer_base_find(sl, ob_src);
if (base_src->collection_properties == NULL) {
continue;
}
if (base_src != NULL) {
Base *base_dst = BKE_scene_layer_base_find(sl, ob_dst);
IDP_MergeGroup(base_dst->collection_properties, base_src->collection_properties, true);