From 9323182e73281d4329d682c640e636d3f4c681ff Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 27 Jul 2017 16:29:45 +0200 Subject: Prevent crash when duplicating object which doesn't have evaluated base properties yet This mainly happens when copy on write is enabled. --- source/blender/blenkernel/intern/collection.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source/blender/blenkernel/intern/collection.c') diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 38534f03123..91fa01a9e0b 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -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); -- cgit v1.2.3