archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Library: correct BKE_id_to_unique_string_key fix

Browse Source
This commit is contained in:
Campbell Barton
2018-12-21 08:33:36 +11:00
parent 4d9606ef19
commit 0dabd312d4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/library.c
View File

@@ -2213,9 +2213,11 @@ char *BKE_id_to_unique_string_key(const struct ID *id)
return BLI_strdup(id->name);
}
else {
/* Important library comes first since we can't ensure an object name won't include a library
* like identifier at the end, but we _can_ ensure every library has an ID after it. */
return BLI_string_joinN(id->lib->id.name, id->name);
/* Prefix with an ascii character in the range of 32..96 (visible)
* this ensures we can't have a library ID pair that collide.
* Where 'LIfooOBbarOBbaz' could be ('LIfoo, OBbarOBbaz') or ('LIfooOBbar', 'OBbaz'). */
const char ascii_len = strlen(id->lib->id.name + 2) + 32;
return BLI_sprintfN("%c%s%s", ascii_len, id->lib->id.name, id->name);
}
}