diff options
author | jon denning <gfxcoder@gmail.com> | 2022-07-29 20:51:49 +0300 |
---|---|---|
committer | jon denning <gfxcoder@gmail.com> | 2022-07-29 20:51:49 +0300 |
commit | 6485941d7a8158381288ce044b657e2c147ff73a (patch) | |
tree | 8fc98916154dfc7d7f57a95732fddb620272d9ac /source/blender/blenloader/intern/versioning_common.cc | |
parent | eee25a175ad3c0736878918bacd4995e67195ec0 (diff) | |
parent | 9b9417b66150fd070619006dbd233369709edf1b (diff) |
Merge branch 'master' into retopo_transformretopo_transform
Diffstat (limited to 'source/blender/blenloader/intern/versioning_common.cc')
-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); |