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/interface/interface_templates.c | |
| parent | 9a67aac8d756181b38fded0bef719736d9e0a311 (diff) | |
| parent | 244ef1f0f53344944642ed0efc016885314f7fd7 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 37 |
1 files changed, 8 insertions, 29 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index a308c984956..addc3156cf3 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -762,15 +762,8 @@ ID *ui_template_id_liboverride_hierarchy_create( 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, - U.experimental.use_override_new_fully_editable); + BKE_lib_override_library_create( + bmain, scene, view_layer, NULL, id, &collection_active->id, NULL, &id_override, false); } else if (object_active != NULL && !ID_IS_LINKED(object_active) && &object_active->instance_collection->id == id) { @@ -783,7 +776,7 @@ ID *ui_template_id_liboverride_hierarchy_create( &object_active->id, &object_active->id, &id_override, - U.experimental.use_override_new_fully_editable); + false); } break; case ID_OB: @@ -793,15 +786,8 @@ ID *ui_template_id_liboverride_hierarchy_create( 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, - U.experimental.use_override_new_fully_editable); + BKE_lib_override_library_create( + bmain, scene, view_layer, NULL, id, &collection_active->id, NULL, &id_override, false); } break; case ID_ME: @@ -832,19 +818,12 @@ ID *ui_template_id_liboverride_hierarchy_create( &collection_active->id, NULL, &id_override, - U.experimental.use_override_new_fully_editable); + false); } 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, - U.experimental.use_override_new_fully_editable); + BKE_lib_override_library_create( + bmain, scene, view_layer, NULL, id, &object_active->id, NULL, &id_override, false); } } break; |