Commit: 3e072da45bee1ac5368b83c84839d2ccdde6e514
Author: Bastien Montagne
Date: Thu Jan 31 11:02:51 2019 +0100
Branches: master
https://developer.blender.org/rB3e072da45bee1ac5368b83c84839d2ccdde6e514
Fix T60432: Blender crashes when dragging objects from other scene from
outliner.
===================================================================
M source/blender/editors/object/object_add.c
===================================================================
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...
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
