From 3af82d2ea092cecf48ecbfe77c8c1dcff445142a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 18 Feb 2025 18:18:02 +0100 Subject: [PATCH] Fix: Preserving linked editable asset datablock fails with embedded ID This is needed to make materials work with this system. Pull Request: https://projects.blender.org/blender/blender/pulls/134226 --- source/blender/blenkernel/intern/blendfile.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc index ae6316edd2e..60c9cbef624 100644 --- a/source/blender/blenkernel/intern/blendfile.cc +++ b/source/blender/blenkernel/intern/blendfile.cc @@ -318,6 +318,12 @@ static bool reuse_bmain_move_id(ReuseOldBMainData *reuse_data, const bool reuse_existing) { id::IDRemapper &remapper = reuse_bmain_data_remapper_ensure(reuse_data); + /* Nothing to move for embedded ID. */ + if (id->flag & ID_FLAG_EMBEDDED_DATA) { + remapper.add(id, id); + return true; + } + Main *new_bmain = reuse_data->new_bmain; Main *old_bmain = reuse_data->old_bmain; ListBase *new_lb = which_libbase(new_bmain, GS(id->name));