bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Missing NULL check causes crash on Ikey when no active object.

Browse Source 
Error is bad enough to go for a retag... hrmf!

Report from Ernesto (der|kunstler) Mndez in irc. Thanks a lot!
This commit is contained in:
Ton Roosendaal 2008-10-22 16:13:30 +00:00
parent fbecf0cadc
commit f005bb1a2a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/src/keyframing.c
View File

@ -921,6 +921,9 @@ static short incl_v3d_ob_shapekey (bKeyingSet *ks, const char mode[])
Object *ob= (G.obedit)? (G.obedit) : (OBACT); Object *ob= (G.obedit)? (G.obedit) : (OBACT);
char *newname= NULL; char *newname= NULL;
if(ob==NULL)
return 0;
/* not available for delete mode */ /* not available for delete mode */
if (strcmp(mode, "Delete")==0) if (strcmp(mode, "Delete")==0)
return 0; return 0;
@ -1183,6 +1186,8 @@ static short incl_buts_ob (bKeyingSet *ks, const char mode[])
{ {
Object *ob= OBACT; Object *ob= OBACT;
/* only if object is mesh type */ /* only if object is mesh type */
if(ob==NULL) return 0;
return (ob->type == OB_MESH); return (ob->type == OB_MESH);
} }