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

Core: Avoid double map lookup in ID remapping

Browse Source 
Theoretically this could improve performance when remapping
many IDs, but the goal is more to have consistent best practices
in the use of `Map`.
This commit is contained in:
Hans Goudey
2024-03-06 19:22:55 -05:00
parent 72758f3296
commit c25a635587
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/lib_id_remapper.cc
View File

@@ -65,7 +65,8 @@ IDRemapperApplyResult IDRemapper::apply(ID **r_id_ptr,
return ID_REMAP_RESULT_SOURCE_NOT_MAPPABLE;
}
if (!mappings_.contains(*r_id_ptr)) {
ID *const *new_id = mappings_.lookup_ptr(*r_id_ptr);
if (new_id == nullptr) {
return ID_REMAP_RESULT_SOURCE_UNAVAILABLE;
}
@@ -73,7 +74,7 @@ IDRemapperApplyResult IDRemapper::apply(ID **r_id_ptr,
id_us_min(*r_id_ptr);
}
*r_id_ptr = mappings_.lookup(*r_id_ptr);
*r_id_ptr = *new_id;
if (options & ID_REMAP_APPLY_UNMAP_WHEN_REMAPPING_TO_SELF && *r_id_ptr == id_self) {
*r_id_ptr = nullptr;
}