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

Bugfix: function new_id() was allowed to be called with NULL.

Browse Source 
Caused by Ken Hughes commit of 5 days ago

Note; dup_id() will go away, is not according to Blender spec.
This commit is contained in:
Ton Roosendaal
2007-03-26 13:02:43 +00:00
parent 31673f0a8c
commit d1315a342d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -811,7 +811,7 @@ int dup_id(ListBase *lb, ID *id, const char *tname)
if( strlen(name) > 21 ) name[21]= 0;
}
if(lb==0) lb= wich_libbase(G.main, GS(id->name));
if(lb==NULL) lb= wich_libbase(G.main, GS(id->name));
/* phase 1: id already exists? */
idtest= lb->first;
@@ -883,8 +883,11 @@ int new_id(ListBase *lb, ID *id, const char *tname)
/* only for local blocks: external en indirect blocks already have a unique ID */
/* return 1: created a new name */
{
int result = dup_id( lb, id, tname );
int result;
if(lb==NULL) lb= wich_libbase(G.main, GS(id->name));
result = dup_id( lb, id, tname );
if( result )
sort_alpha_id(lb, id);