diff options
author | Bastien Montagne <bastien@blender.org> | 2022-08-17 19:08:37 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-08-17 19:08:37 +0300 |
commit | 04a04e9f69a74c72b47865535fc3b7eda2a1afcd (patch) | |
tree | e330d920dffae5729fa7807224fca41d52282526 /source/blender/editors/object | |
parent | 9a67aac8d756181b38fded0bef719736d9e0a311 (diff) | |
parent | 244ef1f0f53344944642ed0efc016885314f7fd7 (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_relations.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 34c4b31dfad..6a922f11c8b 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2280,12 +2280,6 @@ static int make_override_library_exec(bContext *C, wmOperator *op) ID *id_root = NULL; bool is_override_instancing_object = false; - const bool do_fully_editable = U.experimental.use_override_new_fully_editable; - - GSet *user_overrides_objects_uids = do_fully_editable ? NULL : - BLI_gset_new(BLI_ghashutil_inthash_p, - BLI_ghashutil_intcmp, - __func__); bool user_overrides_from_selected_objects = false; if (!ID_IS_LINKED(obact) && obact->instance_collection != NULL && @@ -2325,6 +2319,13 @@ static int make_override_library_exec(bContext *C, wmOperator *op) user_overrides_from_selected_objects = true; } + const bool do_fully_editable = !user_overrides_from_selected_objects; + + GSet *user_overrides_objects_uids = do_fully_editable ? NULL : + BLI_gset_new(BLI_ghashutil_inthash_p, + BLI_ghashutil_intcmp, + __func__); + /* Make already existing selected liboverrides editable. */ FOREACH_SELECTED_OBJECT_BEGIN (view_layer, CTX_wm_view3d(C), ob_iter) { if (ID_IS_OVERRIDE_LIBRARY_REAL(ob_iter) && !ID_IS_LINKED(ob_iter)) { |