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

Anim: make Slot::users_remove() gracefully deal with duplicate users

Browse Source 
`animrig::Slot::users_remove()` now also works when there are multiple
occurrences of the same ID. Because of the above-mentioned pointer
remapping now working correctly, the pointers in the slot user list
are not 100% under control of the Slot class, and thus there could
hypothetically be duplicates there.

This doesn't fix any concrete issues, it's just a safety measure.

Pull Request: https://projects.blender.org/blender/blender/pulls/131806
This commit is contained in:
Sybren A. Stüvel
2024-12-13 10:42:54 +01:00
parent 09ef6c1a12
commit 0fb8a64900
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/animrig/intern/action.cc
View File

@@ -1101,12 +1101,11 @@ void Slot::users_remove(ID &animated_id)
BLI_assert(this->runtime);
Vector<ID *> &users = this->runtime->users;
const int64_t vector_index = users.first_index_of_try(&animated_id);
if (vector_index < 0) {
return;
}
users.remove_and_reorder(vector_index);
/* Even though users_add() ensures that there are no duplicates, there's still things like
* pointer swapping etc. that can happen via the foreach-id looping code. That means that the
* entries in the user map are not 100% under control of the user_add() and user_remove()
* function, and thus we cannot assume that there are no duplicates. */
users.remove_if([&](const ID *user) { return user == &animated_id; });
}
void Slot::users_invalidate(Main &bmain)