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

Merged changes in the trunk up to revision 31630.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-08-28 14:30:52 +00:00
parent d8b2d1945a f28b5e672e
commit 12f9a5de5b
259 changed files with 2948 additions and 1773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1108,8 +1108,14 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
left_len= splitIDname(name, left, &nr);
/* if new name will be too long, truncate it */
if(nr>999 && strlen(left)>16) left[16]= 0;
else if(strlen(left)>17) left[17]= 0;
if(nr > 999 && left_len > 16) {
left[16]= 0;
left_len= 16;
}
else if(left_len > 17) {
left[17]= 0;
left_len= 17;
}
for(idtest= lb->first; idtest; idtest= idtest->next) {
if( (id != idtest) &&
@@ -1138,8 +1144,8 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
* rather than just chopping and adding numbers,
* shave off the end chars until we have a unique name.
* Check the null terminators match as well so we dont get Cube.000 -> Cube.00 */
if (nr==0 && name[left_len]== left[left_len]) {
int len = strlen(name)-1;
if (nr==0 && name[left_len]== '\0') {
int len = left_len-1;
idtest= is_dupid(lb, id, name);
while (idtest && len> 1) {
@@ -1150,10 +1156,11 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
/* otherwise just continue and use a number suffix */
}
if(nr > 999 && strlen(left) > 16) {
if(nr > 999 && left_len > 16) {
/* this would overflow name buffer */
left[16] = 0;
strcpy( name, left );
/* left_len = 16; */ /* for now this isnt used again */
memcpy(name, left, sizeof(char) * 16);
continue;
}
/* this format specifier is from hell... */