griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor: Call same 'after_setup' versioning code for linking as for blendfile reading.

Browse Source 
While `do_versions_after_setup` does more than what was previously done
by link/append code (essentially also handles pre-2.50 IPO and sound
proxy conversions), there is no real fundamental reasons to not use it
in linking code.

The IPO and sound proxy conversion codes are likely fully broken for
linked data - but they should then be removed or fixed, since they will
be applied on linked data in blendfile reading case anyway.

And in general, versioning should 'just work' the same when loading a
whole blendfile, or linking some data from a library. Keeping things
separate only makes it harder to work with, and easier to hide issues
with linked data.
This commit is contained in:
Bastien Montagne
2024-05-10 12:25:17 +02:00
parent d1a5cdfe2c
commit 71d92735bf
1 changed files with 6 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
source/blender/blenkernel/intern/blendfile_link_append.cc
View File

@@ -1104,32 +1104,6 @@ static int foreach_libblock_link_append_callback(LibraryIDLinkCallbackData *cb_d
/** \name Library link/append code.
* \{ */
static void blendfile_link_append_proxies_convert(Main *bmain, ReportList *reports)
{
/* NOTE: Do not bother checking file versions here, if there are no proxies to convert this code
* is quite fast anyway. */
BlendFileReadReport bf_reports{};
bf_reports.reports = reports;
BKE_lib_override_library_main_proxy_convert(bmain, &bf_reports);
/* Currently liboverride code can generate invalid namemap. This is a known issue, requires
* #107847 to be properly fixed. */
BKE_main_namemap_validate_and_fix(bmain);
if (bf_reports.count.proxies_to_lib_overrides_success != 0 ||
bf_reports.count.proxies_to_lib_overrides_failures != 0)
{
BKE_reportf(bf_reports.reports,
RPT_WARNING,
"Proxies have been removed from Blender (%d proxies were automatically converted "
"to library overrides, %d proxies could not be converted and were cleared). "
"Consider re-saving any library .blend file with the newest Blender version",
bf_reports.count.proxies_to_lib_overrides_success,
bf_reports.count.proxies_to_lib_overrides_failures);
}
}
void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList *reports)
{
if (lapp_context->num_items == 0) {
@@ -1380,16 +1354,9 @@ void BKE_blendfile_append(BlendfileLinkAppendContext *lapp_context, ReportList *
BKE_main_id_newptr_and_tag_clear(bmain);
blendfile_link_append_proxies_convert(bmain, reports);
BKE_main_mesh_legacy_convert_auto_smooth(*bmain);
if (U.experimental.use_grease_pencil_version3 &&
U.experimental.use_grease_pencil_version3_convert_on_load)
{
BlendFileReadReport bf_reports{};
bf_reports.reports = reports;
blender::bke::greasepencil::convert::legacy_main(*bmain, bf_reports);
}
BlendFileReadReport bf_reports{};
bf_reports.reports = reports;
BLO_read_do_version_after_setup(bmain, &bf_reports);
}
static void blendfile_link_finalize(BlendfileLinkAppendContext *lapp_context, ReportList *reports)
@@ -1428,16 +1395,9 @@ static void blendfile_link_finalize(BlendfileLinkAppendContext *lapp_context, Re
loose_data_instantiate(&instantiate_context);
}
blendfile_link_append_proxies_convert(lapp_context->params->bmain, reports);
BKE_main_mesh_legacy_convert_auto_smooth(*lapp_context->params->bmain);
if (U.experimental.use_grease_pencil_version3 &&
U.experimental.use_grease_pencil_version3_convert_on_load)
{
BlendFileReadReport bf_reports{};
bf_reports.reports = reports;
blender::bke::greasepencil::convert::legacy_main(*lapp_context->params->bmain, bf_reports);
}
BlendFileReadReport bf_reports{};
bf_reports.reports = reports;
BLO_read_do_version_after_setup(lapp_context->params->bmain, &bf_reports);
}
void BKE_blendfile_link(BlendfileLinkAppendContext *lapp_context, ReportList *reports)