diff options
| author | Aras Pranckevicius <aras@nesnausk.org> | 2022-07-28 21:27:14 +0300 |
|---|---|---|
| committer | Aras Pranckevicius <aras@nesnausk.org> | 2022-07-28 21:27:14 +0300 |
| commit | 9c65af2df0bfb50ec6369b2344d9b9e691397f0d (patch) | |
| tree | 980fb9fdc640603a2771bb784cd605f4a8930a98 | |
| parent | ae89fcfdafd9fd260bcb8a58600ea16c37732a4b (diff) | |
| parent | 68db023329b77ac06e2a7c7881391631e986c79d (diff) | |
Merge branch 'blender-v3.3-release'
| -rw-r--r-- | source/blender/blenloader/intern/versioning_common.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_common.cc b/source/blender/blenloader/intern/versioning_common.cc index d2a55f6f37e..823385727e1 100644 --- a/source/blender/blenloader/intern/versioning_common.cc +++ b/source/blender/blenloader/intern/versioning_common.cc @@ -18,6 +18,7 @@ #include "BKE_animsys.h" #include "BKE_lib_id.h" #include "BKE_main.h" +#include "BKE_main_namemap.h" #include "BKE_node.h" #include "MEM_guardedalloc.h" @@ -66,6 +67,7 @@ ID *do_versions_rename_id(Main *bmain, } } if (id != nullptr) { + BKE_main_namemap_remove_name(bmain, id, id->name + 2); BLI_strncpy(id->name + 2, name_dst, sizeof(id->name) - 2); /* We know it's unique, this just sorts. */ BLI_libblock_ensure_unique_name(bmain, id->name); |