diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-28 14:02:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-28 14:02:20 +0300 |
| commit | e39dc48bd51c6ba5ba72f2ebdf66a91ac6630170 (patch) | |
| tree | eca02492a596ccf1befcc8c4795e6d836838c904 /source/blender/blenkernel/intern/collection.c | |
| parent | 50cc0aa0d136e91208487163efd3744a8e873bcc (diff) | |
Fix crash when duplicating object
This fixes null pointer check fiasco.
Diffstat (limited to 'source/blender/blenkernel/intern/collection.c')
| -rw-r--r-- | source/blender/blenkernel/intern/collection.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 91fa01a9e0b..2b69c176c39 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -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); } |