blender
/
blender
135
420
Fork 602
Code Issues 6.3k Pull Requests 760 Projects 19 Wiki Activity

Fix #103410: name collisions between vertex groups and attributes #109910

Merged
Philipp Oeser merged 8 commits from lichtwerk/blender:103410 into main 2023-08-08 10:11:18 +02:00
Conversation 7 Commits 8 Files Changed 4 +2 -4
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 004ff868d7 - Show all commits

6
source/blender/blenkernel/intern/deform.cc
View File

@ -684,9 +684,7 @@ int BKE_object_defgroup_flip_index(const Object *ob, int index, const bool use_d
static bool defgroup_find_name_dupe(const char *name, bDeformGroup *dg, ID *id)
{
const ListBase *defbase = (GS(id->name) == ID_OB) ?
BKE_object_defgroup_list((const Object *)id) :
BKE_id_defgroup_list_get(id);
const ListBase *defbase = BKE_id_defgroup_list_get(id);
LISTBASE_FOREACH (bDeformGroup *, curdef, defbase) {
if (dg != curdef) {
@ -720,7 +718,7 @@ void BKE_object_defgroup_unique_name(bDeformGroup *dg, Object *ob)
sizeof(dg->name));
}
else {
AttributeAndDefgroupUniqueNameData data{&ob->id, dg};
AttributeAndDefgroupUniqueNameData data{static_cast<ID *>(ob->data), dg};
BLI_uniquename_cb(
BKE_defgroup_unique_name_check, &data, DATA_("Group"), '.', dg->name, sizeof(dg->name));
}