From b454a1223317c8d05bc09a745f85eae22be658e8 Mon Sep 17 00:00:00 2001 From: Philipp Oeser Date: Wed, 23 Oct 2019 12:28:32 +0200 Subject: Separate operators (mesh/curve/armature/gpencil): take user preferences into account for duplicating actions Previously actions remained linked after duplication, now this is based on the User Preferences (PreferencesEdit.use_duplicate_action). note: default is ON here, so this changes default behavior of separate operators. First intuition was to respect _all_ preferences here (e.g. also duplicating materials if chosen in the User Preferences) but after consideration this is probably not what the User would expect from such 'modeling' opertions (e.g. separate by loose parts resulting in possibly many duplicate materials) Fixes T71038 Maniphest Tasks: T71038 Differential Revision: https://developer.blender.org/D6120 --- source/blender/editors/mesh/editmesh_tools.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/mesh') diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 4003a7dd7bb..2176bbceb5f 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3929,7 +3929,9 @@ static Base *mesh_separate_tagged( CustomData_bmesh_init_pool(&bm_new->ldata, bm_mesh_allocsize_default.totloop, BM_LOOP); CustomData_bmesh_init_pool(&bm_new->pdata, bm_mesh_allocsize_default.totface, BM_FACE); - base_new = ED_object_add_duplicate(bmain, scene, view_layer, base_old, USER_DUP_MESH); + /* Take into account user preferences for duplicating actions. */ + short dupflag = USER_DUP_MESH | (U.dupflag & USER_DUP_ACT); + base_new = ED_object_add_duplicate(bmain, scene, view_layer, base_old, dupflag); /* normally would call directly after but in this case delay recalc */ /* DAG_relations_tag_update(bmain); */ @@ -3999,7 +4001,9 @@ static Base *mesh_separate_arrays(Main *bmain, CustomData_bmesh_init_pool(&bm_new->ldata, faces_len * 3, BM_LOOP); CustomData_bmesh_init_pool(&bm_new->pdata, faces_len, BM_FACE); - base_new = ED_object_add_duplicate(bmain, scene, view_layer, base_old, USER_DUP_MESH); + /* Take into account user preferences for duplicating actions. */ + short dupflag = USER_DUP_MESH | (U.dupflag & USER_DUP_ACT); + base_new = ED_object_add_duplicate(bmain, scene, view_layer, base_old, dupflag); /* normally would call directly after but in this case delay recalc */ /* DAG_relations_tag_update(bmain); */ -- cgit v1.2.3