archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix crash when duplicating object

Browse Source 
This fixes null pointer check fiasco.
This commit is contained in:
Sergey Sharybin
2017-07-28 13:02:20 +02:00
parent 50cc0aa0d1
commit e39dc48bd5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/collection.c
View File

@@ -260,10 +260,10 @@ 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) {
if (base_src->collection_properties == NULL) {
continue;
}
Base *base_dst = BKE_scene_layer_base_find(sl, ob_dst);
IDP_MergeGroup(base_dst->collection_properties, base_src->collection_properties, true);
}