diff options
| author | Bastien Montagne <bastien@blender.org> | 2022-07-07 19:17:30 +0300 |
|---|---|---|
| committer | Bastien Montagne <bastien@blender.org> | 2022-07-07 19:19:11 +0300 |
| commit | 7cfea48752ebc544104d57d19736c201a98bc3cd (patch) | |
| tree | bf52383d8fa5b36f815e82388b3d982dd9121ad2 /source/blender/editors/interface/interface_templates.c | |
| parent | b8605ee458e31420a4e6653c223f841c5875a21d (diff) | |
LibOverride: Make fully editable when creating an experimental user setting.
This is temporary to investigate which behavior should be kept when
creating an override hierarchy if there are no cherry-picked data
defined: make all overrides user-editable, or not.
This removes the 'make override - fully editable' menu entries.
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 37 |
1 files changed, 29 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 96d31700eb9..14da5a7cd62 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -741,8 +741,15 @@ static void template_id_liboverride_hierarchy_create(bContext *C, if (object_active != NULL) { object_active->id.tag |= LIB_TAG_DOIT; } - BKE_lib_override_library_create( - bmain, scene, view_layer, NULL, id, &collection_active->id, NULL, &id_override, false); + BKE_lib_override_library_create(bmain, + scene, + view_layer, + NULL, + id, + &collection_active->id, + NULL, + &id_override, + U.experimental.use_override_new_fully_editable); } else if (object_active != NULL && !ID_IS_LINKED(object_active) && &object_active->instance_collection->id == id) { @@ -755,7 +762,7 @@ static void template_id_liboverride_hierarchy_create(bContext *C, &object_active->id, &object_active->id, &id_override, - false); + U.experimental.use_override_new_fully_editable); } break; case ID_OB: @@ -765,8 +772,15 @@ static void template_id_liboverride_hierarchy_create(bContext *C, if (object_active != NULL) { object_active->id.tag |= LIB_TAG_DOIT; } - BKE_lib_override_library_create( - bmain, scene, view_layer, NULL, id, &collection_active->id, NULL, &id_override, false); + BKE_lib_override_library_create(bmain, + scene, + view_layer, + NULL, + id, + &collection_active->id, + NULL, + &id_override, + U.experimental.use_override_new_fully_editable); } break; case ID_ME: @@ -796,12 +810,19 @@ static void template_id_liboverride_hierarchy_create(bContext *C, &collection_active->id, NULL, &id_override, - false); + U.experimental.use_override_new_fully_editable); } else { object_active->id.tag |= LIB_TAG_DOIT; - BKE_lib_override_library_create( - bmain, scene, view_layer, NULL, id, &object_active->id, NULL, &id_override, false); + BKE_lib_override_library_create(bmain, + scene, + view_layer, + NULL, + id, + &object_active->id, + NULL, + &id_override, + U.experimental.use_override_new_fully_editable); } } break; |