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

Fix T60432: Blender crashes when dragging objects from other scene from outliner.

Browse Source
This commit is contained in:
Bastien Montagne
2019-01-31 11:02:51 +01:00
parent 8f4b7d706b
commit 3e072da45b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/object/object_add.c
View File

@@ -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...