[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35510] trunk/blender/source/blender/ editors/animation/keyframing.c: Bugfix [#26484] delete keyframe in pose mode --> segmentation fault

[Joshua Leung]

Revision: 35510
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35510
Author:   aligorith
Date:     2011-03-13 09:27:28 +0000 (Sun, 13 Mar 2011)
Log Message:
-----------
Bugfix [#26484] delete keyframe in pose mode --> segmentation fault

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/keyframing.c

Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c	2011-03-13 06:44:40 UTC (rev 35509)
+++ trunk/blender/source/blender/editors/animation/keyframing.c	2011-03-13 09:27:28 UTC (rev 35510)
@@ -1332,7 +1332,7 @@
 		short success= 0;
 		
 		/* loop through all curves in animdata and delete keys on this frame */
-		if (ob->adt) {
+		if ((ob->adt) && (ob->adt->action)) {
 			AnimData *adt= ob->adt;
 			bAction *act= adt->action;
 			
@@ -1342,7 +1342,7 @@
 			}
 		}
 		
-		BKE_reportf(op->reports, RPT_INFO, "Ob '%s' - Successfully removed %d keyframes \n", id->name+2, success);
+		BKE_reportf(op->reports, RPT_INFO, "Ob '%s' - Successfully had %d keyframes removed", id->name+2, success);
 		
 		ob->recalc |= OB_RECALC_OB;
 	}