diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-31 13:02:51 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-01-31 13:03:28 +0300 |
| commit | 3e072da45bee1ac5368b83c84839d2ccdde6e514 (patch) | |
| tree | 856776c181624c10f25cfc44da1d375562747a69 /source/blender | |
| parent | 8f4b7d706b0e9d032ee2c5fff6467bbd68763ba0 (diff) | |
Fix T60432: Blender crashes when dragging objects from other scene from outliner.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index fdbe324ab3d..7f71596b3c4 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2240,8 +2240,11 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, ViewLayer LayerCollection *layer_collection = BKE_layer_collection_get_active(view_layer); BKE_collection_object_add(bmain, layer_collection->collection, obn); } + basen = BKE_view_layer_base_find(view_layer, obn); - basen->local_view_bits = base->local_view_bits; + if (base != NULL) { + basen->local_view_bits = base->local_view_bits; + } /* 1) duplis should end up in same collection as the original * 2) Rigid Body sim participants MUST always be part of a collection... |