diff options
author | Bastien Montagne <bastien@blender.org> | 2022-08-18 13:36:41 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-08-18 13:36:41 +0300 |
commit | 756308f9e464245a3208af7593e45d2f30c8328f (patch) | |
tree | b6ff42cf8b30b11f459ce0994bbc337bbd2b9a47 /source/blender/editors/interface | |
parent | 1854d313218b9cb1be1a67e256783cda2703db8f (diff) | |
parent | c3757504233ab7b1dca7102bb9239423d6419efc (diff) |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index addc3156cf3..f94b978f910 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -683,7 +683,7 @@ ID *ui_template_id_liboverride_hierarchy_create( * NOTE: do not attempt to perform such hierarchy override at all cost, if there is not enough * context, better to abort than create random overrides all over the place. */ if (!ID_IS_OVERRIDABLE_LIBRARY_HIERARCHY(id)) { - RNA_warning("The data-block %s is not direclty overridable", id->name); + RNA_warning("The data-block %s is not overridable", id->name); return NULL; } @@ -789,6 +789,15 @@ ID *ui_template_id_liboverride_hierarchy_create( BKE_lib_override_library_create( bmain, scene, view_layer, NULL, id, &collection_active->id, NULL, &id_override, false); } + else { + if (object_active != NULL) { + object_active->id.tag |= LIB_TAG_DOIT; + } + BKE_lib_override_library_create( + bmain, scene, view_layer, NULL, id, NULL, NULL, &id_override, false); + BKE_scene_collections_object_remove(bmain, scene, (Object *)id, true); + WM_event_add_notifier(C, NC_ID | NA_REMOVED, NULL); + } break; case ID_ME: case ID_CU_LEGACY: |