diff options
author | Bastien Montagne <bastien@blender.org> | 2022-02-02 19:22:12 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2022-02-02 19:22:12 +0300 |
commit | eb0e0a3b75e0156652d904d4b1d99b31bba02850 (patch) | |
tree | 7b726617092da2c6dd22a39e905cffa83118c4b6 /source/blender/blenkernel/intern/lib_override.c | |
parent | a83fff7c6324d1a6d651409f6d7a4f4fc5364a5b (diff) |
LibOverride: Move proxy conversion code in its own file.
This will allow to keep the access to deprecated DNA proxy data in that
specific file, instead of allowing deprecated accesses in the whole
override kernel code.
Part of T91671.
Diffstat (limited to 'source/blender/blenkernel/intern/lib_override.c')
-rw-r--r-- | source/blender/blenkernel/intern/lib_override.c | 122 |
1 files changed, 0 insertions, 122 deletions
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 871e73b12bb..c3b2eae83d4 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -1047,128 +1047,6 @@ bool BKE_lib_override_library_template_create(struct ID *id) return true; } -bool BKE_lib_override_library_proxy_convert(Main *bmain, - Scene *scene, - ViewLayer *view_layer, - Object *ob_proxy) -{ - /* `proxy_group`, if defined, is the empty instantiating the collection from which the proxy is - * coming. */ - Object *ob_proxy_group = ob_proxy->proxy_group; - const bool is_override_instancing_object = ob_proxy_group != NULL; - ID *id_root = is_override_instancing_object ? &ob_proxy_group->instance_collection->id : - &ob_proxy->proxy->id; - ID *id_reference = is_override_instancing_object ? &ob_proxy_group->id : &ob_proxy->id; - - /* In some cases the instance collection of a proxy object may be local (see e.g. T83875). Not - * sure this is a valid state, but for now just abort the overriding process. */ - if (!ID_IS_OVERRIDABLE_LIBRARY_HIERARCHY(id_root)) { - if (ob_proxy->proxy != NULL) { - ob_proxy->proxy->proxy_from = NULL; - } - id_us_min((ID *)ob_proxy->proxy); - ob_proxy->proxy = ob_proxy->proxy_group = NULL; - return false; - } - - /* We manually convert the proxy object into a library override, further override handling will - * then be handled by `BKE_lib_override_library_create()` just as for a regular override - * creation. - */ - ob_proxy->proxy->id.tag |= LIB_TAG_DOIT; - ob_proxy->proxy->id.newid = &ob_proxy->id; - BKE_lib_override_library_init(&ob_proxy->id, &ob_proxy->proxy->id); - - ob_proxy->proxy->proxy_from = NULL; - ob_proxy->proxy = ob_proxy->proxy_group = NULL; - - DEG_id_tag_update(&ob_proxy->id, ID_RECALC_COPY_ON_WRITE); - - /* In case of proxy conversion, remap all local ID usages to linked IDs to their newly created - * overrides. Also do that for the IDs from the same lib as the proxy in case it is linked. - * While this might not be 100% the desired behavior, it is likely to be the case most of the - * time. Ref: T91711. */ - ID *id_iter; - FOREACH_MAIN_ID_BEGIN (bmain, id_iter) { - if (!ID_IS_LINKED(id_iter) || id_iter->lib == ob_proxy->id.lib) { - id_iter->tag |= LIB_TAG_DOIT; - } - } - FOREACH_MAIN_ID_END; - - return BKE_lib_override_library_create( - bmain, scene, view_layer, ob_proxy->id.lib, id_root, id_reference, NULL); -} - -static void lib_override_library_proxy_convert_do(Main *bmain, - Scene *scene, - Object *ob_proxy, - BlendFileReadReport *reports) -{ - Object *ob_proxy_group = ob_proxy->proxy_group; - const bool is_override_instancing_object = ob_proxy_group != NULL; - - const bool success = BKE_lib_override_library_proxy_convert(bmain, scene, NULL, ob_proxy); - - if (success) { - CLOG_INFO(&LOG, - 4, - "Proxy object '%s' successfully converted to library overrides", - ob_proxy->id.name); - /* Remove the instance empty from this scene, the items now have an overridden collection - * instead. */ - if (is_override_instancing_object) { - BKE_scene_collections_object_remove(bmain, scene, ob_proxy_group, true); - } - reports->count.proxies_to_lib_overrides_success++; - } -} - -void BKE_lib_override_library_main_proxy_convert(Main *bmain, BlendFileReadReport *reports) -{ - LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { - FOREACH_SCENE_OBJECT_BEGIN (scene, object) { - if (object->proxy_group == NULL) { - continue; - } - - lib_override_library_proxy_convert_do(bmain, scene, object, reports); - } - FOREACH_SCENE_OBJECT_END; - - FOREACH_SCENE_OBJECT_BEGIN (scene, object) { - if (object->proxy == NULL) { - continue; - } - - lib_override_library_proxy_convert_do(bmain, scene, object, reports); - } - FOREACH_SCENE_OBJECT_END; - } - - LISTBASE_FOREACH (Object *, object, &bmain->objects) { - if (object->proxy_group != NULL || object->proxy != NULL) { - if (ID_IS_LINKED(object)) { - CLOG_WARN(&LOG, - "Linked proxy object '%s' from '%s' failed to be converted to library override", - object->id.name + 2, - object->id.lib->filepath); - } - else { - CLOG_WARN(&LOG, - "Proxy object '%s' failed to be converted to library override", - object->id.name + 2); - } - reports->count.proxies_to_lib_overrides_failures++; - if (object->proxy != NULL) { - object->proxy->proxy_from = NULL; - } - id_us_min((ID *)object->proxy); - object->proxy = object->proxy_group = NULL; - } - } -} - static void lib_override_library_remap(Main *bmain, const ID *id_root_reference, GHash *linkedref_to_old_override) |