kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

[#22876] Add new scene, stacker ".00" bug

Browse Source 
fix for r30441, (reverted for the beta), splitIDname wasnt returning the correct string length.
This commit is contained in:
Campbell Barton 2010-07-23 04:41:27 +00:00
parent 026ac24922
commit bd30c4da8a
2 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_library.h
View File

@ -63,7 +63,7 @@ void free_libblock_us(struct ListBase *lb, void *idv);
void free_main(struct Main *mainvar); void free_main(struct Main *mainvar);
void tag_main(struct Main *mainvar, int tag); void tag_main(struct Main *mainvar, int tag);
void splitIDname(char *name, char *left, int *nr); int splitIDname(char *name, char *left, int *nr);
void rename_id(struct ID *id, char *name); void rename_id(struct ID *id, char *name);
void test_idbutton(char *name); void test_idbutton(char *name);
void text_idbutton(struct ID *id, char *text); void text_idbutton(struct ID *id, char *text);
@ -85,4 +85,3 @@ void set_free_windowmanager_cb(void (*func)(struct bContext *, struct wmWindowMa
#define ID_FALLBACK_NAME "Untitled" #define ID_FALLBACK_NAME "Untitled"
#endif #endif

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

@ -995,7 +995,7 @@ void IMAnames_to_pupstring(char **str, char *title, char *extraops, ListBase *lb
/* used by buttons.c library.c mball.c */ /* used by buttons.c library.c mball.c */
void splitIDname(char *name, char *left, int *nr) int splitIDname(char *name, char *left, int *nr)
{ {
int a; int a;
@ -1003,19 +1003,23 @@ void splitIDname(char *name, char *left, int *nr)
strncpy(left, name, 21); strncpy(left, name, 21);
a= strlen(name); a= strlen(name);
if(a>1 && name[a-1]=='.') return; if(a>1 && name[a-1]=='.') return a;
while(a--) { while(a--) {
if( name[a]=='.' ) { if( name[a]=='.' ) {
left[a]= 0; left[a]= 0;
*nr= atol(name+a+1); *nr= atol(name+a+1);
return; return a;
} }
if( isdigit(name[a])==0 ) break; if( isdigit(name[a])==0 ) break;
left[a]= 0; left[a]= 0;
} }
strcpy(left, name);
for(a= 0; name[a]; a++)
left[a]= name[a];
return a;
} }
static void sort_alpha_id(ListBase *lb, ID *id) static void sort_alpha_id(ListBase *lb, ID *id)
@ -1077,8 +1081,7 @@ static ID *is_dupid(ListBase *lb, ID *id, char *name)
static int check_for_dupid(ListBase *lb, ID *id, char *name) static int check_for_dupid(ListBase *lb, ID *id, char *name)
{ {
ID *idtest; ID *idtest;
int nr= 0, nrtest, a; int nr= 0, nrtest, a, left_len;
const int maxtest=32;
char left[32], leftest[32], in_use[32]; char left[32], leftest[32], in_use[32];
/* make sure input name is terminated properly */ /* make sure input name is terminated properly */
@ -1095,31 +1098,31 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
/* we have a dup; need to make a new name */ /* we have a dup; need to make a new name */
/* quick check so we can reuse one of first 32 ids if vacant */ /* quick check so we can reuse one of first 32 ids if vacant */
memset(in_use, 0, maxtest); memset(in_use, 0, sizeof(in_use));
/* get name portion, number portion ("name.number") */ /* get name portion, number portion ("name.number") */
splitIDname( name, left, &nr); left_len= splitIDname(name, left, &nr);
/* if new name will be too long, truncate it */ /* if new name will be too long, truncate it */
if(nr>999 && strlen(left)>16) left[16]= 0; if(nr>999 && strlen(left)>16) left[16]= 0;
else if(strlen(left)>17) left[17]= 0; else if(strlen(left)>17) left[17]= 0;
for( idtest = lb->first; idtest; idtest = idtest->next ) { for(idtest= lb->first; idtest; idtest= idtest->next) {
if( id != idtest && idtest->lib == NULL ) { if( (id != idtest) &&
splitIDname(idtest->name+2, leftest, &nrtest); (idtest->lib == NULL) &&
/* if base names match... */ (*name == *(idtest->name+2)) &&
/* optimized */ (strncmp(name, idtest->name+2, left_len)==0) &&
if( *left == *leftest && strcmp(left, leftest)==0 ) { (splitIDname(idtest->name+2, leftest, &nrtest) == left_len)
if(nrtest < maxtest) ) {
in_use[nrtest]= 1; /* mark as used */ if(nrtest < sizeof(in_use))
if(nr <= nrtest) in_use[nrtest]= 1; /* mark as used */
nr= nrtest+1; /* track largest unused */ if(nr <= nrtest)
} nr= nrtest+1; /* track largest unused */
} }
} }
/* decide which value of nr to use */ /* decide which value of nr to use */
for(a=0; a<maxtest; a++) { for(a=0; a < sizeof(in_use); a++) {
if(a>=nr) break; /* stop when we've check up to biggest */ if(a>=nr) break; /* stop when we've check up to biggest */
if( in_use[a]==0 ) { /* found an unused value */ if( in_use[a]==0 ) { /* found an unused value */
nr = a; nr = a;
@ -1129,8 +1132,9 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
/* If the original name has no numeric suffix, /* If the original name has no numeric suffix,
* rather than just chopping and adding numbers, * rather than just chopping and adding numbers,
* shave off the end chars until we have a unique name */ * shave off the end chars until we have a unique name.
if (nr==0) { * 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; int len = strlen(name)-1;
idtest= is_dupid(lb, id, name); idtest= is_dupid(lb, id, name);
@ -1389,4 +1393,3 @@ void rename_id(ID *id, char *name)
new_id(lb, id, name); new_id(lb, id, name);
} }