Revision: 17179
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17179
Author:   ton
Date:     2008-10-22 18:13:30 +0200 (Wed, 22 Oct 2008)

Log Message:
-----------
Missing NULL check causes crash on Ikey when no active object.
Error is bad enough to go for a retag... hrmf!

Report from Ernesto (der|kunstler) Mndez in irc. Thanks a lot!

Modified Paths:
--------------
    trunk/blender/source/blender/src/keyframing.c

Modified: trunk/blender/source/blender/src/keyframing.c
===================================================================
--- trunk/blender/source/blender/src/keyframing.c       2008-10-22 14:31:27 UTC 
(rev 17178)
+++ trunk/blender/source/blender/src/keyframing.c       2008-10-22 16:13:30 UTC 
(rev 17179)
@@ -921,6 +921,9 @@
        Object *ob= (G.obedit)? (G.obedit) : (OBACT);
        char *newname= NULL;
        
+       if(ob==NULL)
+               return 0;
+       
        /* not available for delete mode */
        if (strcmp(mode, "Delete")==0)
                return 0;
@@ -1183,6 +1186,8 @@
 {
        Object *ob= OBACT;
        /* only if object is mesh type */
+       
+       if(ob==NULL) return 0;
        return (ob->type == OB_MESH);
 }
 


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to