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
path: root/source
diff options
context:
space:
mode:
authorDalai Felinto <dfelinto@gmail.com>2017-10-18 01:13:51 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-10-18 01:14:06 +0300
commit5aff67fb5ee5490b95732519f1ed565fcc11e7af (patch)
treeb1fc8a60d3bed9833146fd9639c6e0e2bbe78266 /source
parent028a558116d094fe9591855d82b210403f32f5db (diff)
Fix crash when Making Duplicates Real for groups
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/object/object_add.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index a311c77f867..486c4637d08 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1459,8 +1459,9 @@ static void make_object_duplilist_real(bContext *C, Scene *scene, Base *base,
ob_dst->totcol = 0;
}
- BKE_collection_object_add_from(scene, ob_src, ob_dst);
+ BKE_collection_object_add_from(scene, base->object, ob_dst);
base_dst = BKE_scene_layer_base_find(sl, ob_dst);
+ BLI_assert(base_dst != NULL);
BKE_scene_object_base_flag_sync_from_base(base_dst);