diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-08-25 01:40:18 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-08-25 01:40:18 +0300 |
| commit | 137a5e162c2435662dbb299ff49771e7d2e7598f (patch) | |
| tree | a40ebf526c1a320c7a9fa0c8456dfe2ffd4db6a6 /source/blender/editors/object/object_add.c | |
| parent | aad18a005026cfaa19c45f2477318c6e06303eae (diff) | |
| parent | 5ef3afd87c54b47614254d95c9b2e9a17c60f76e (diff) | |
Merge branch 'master' into refactor-idprop-ui-data
Diffstat (limited to 'source/blender/editors/object/object_add.c')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index f98f3242163..34400462d38 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2844,7 +2844,8 @@ static int object_convert_exec(bContext *C, wmOperator *op) matrix, 0, use_seams, - use_faces); + use_faces, + true); /* Remove unused materials. */ int actcol = ob_gpencil->actcol; @@ -3358,8 +3359,13 @@ Base *ED_object_add_duplicate( Base *basen; Object *ob; - basen = object_add_duplicate_internal( - bmain, scene, view_layer, base->object, dupflag, LIB_ID_DUPLICATE_IS_SUBPROCESS); + basen = object_add_duplicate_internal(bmain, + scene, + view_layer, + base->object, + dupflag, + LIB_ID_DUPLICATE_IS_SUBPROCESS | + LIB_ID_DUPLICATE_IS_ROOT_ID); if (basen == NULL) { return NULL; } @@ -3394,8 +3400,13 @@ static int duplicate_exec(bContext *C, wmOperator *op) BKE_main_id_newptr_and_tag_clear(bmain); CTX_DATA_BEGIN (C, Base *, base, selected_bases) { - Base *basen = object_add_duplicate_internal( - bmain, scene, view_layer, base->object, dupflag, LIB_ID_DUPLICATE_IS_SUBPROCESS); + Base *basen = object_add_duplicate_internal(bmain, + scene, + view_layer, + base->object, + dupflag, + LIB_ID_DUPLICATE_IS_SUBPROCESS | + LIB_ID_DUPLICATE_IS_ROOT_ID); /* note that this is safe to do with this context iterator, * the list is made in advance */ @@ -3515,7 +3526,7 @@ static int object_add_named_exec(bContext *C, wmOperator *op) * the case here. So we have to do the new-ID relinking ourselves * (#copy_object_set_idnew()). */ - LIB_ID_DUPLICATE_IS_SUBPROCESS); + LIB_ID_DUPLICATE_IS_SUBPROCESS | LIB_ID_DUPLICATE_IS_ROOT_ID); } else { /* basen is actually not a new base in this case. */ |