Keyframe-related bugfixes:

* Deleting keyframes should be safer now
* Graph Editor no longer crashes on F-Curves with no keyframes/samples
* Silenced console prints that occurred when an F-Curve had now keyframes.

2 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index 30d05b91582..cf7d56da5d9 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -103,6 +103,13 @@ void delete_fcurve_keys(FCurve *fcu)
 		}
 	}
 	
+	/* Free the array of BezTriples if there are not keyframes */
+	if (fcu->totvert == 0) {
+		if (fcu->bezt) 
+			MEM_freeN(fcu->bezt);
+		fcu->bezt= NULL;
+	}
+	
 #if 0 // XXX for now, we don't get rid of empty curves...
 	/* Only delete if there isn't an ipo-driver still hanging around on an empty curve */
 	if ((icu->totvert==0) && (icu->driver==NULL)) {
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 110fd84a630..df3a7b85a45 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -2267,7 +2267,7 @@ short action_frame_has_keyframe (bAction *act, float frame, short filter)
 	 */
 	for (fcu= act->curves.first; fcu; fcu= fcu->next) {
 		/* only check if there are keyframes (currently only of type BezTriple) */
-		if (fcu->bezt) {
+		if (fcu->bezt && fcu->totvert) {
 			/* we either include all regardless of muting, or only non-muted  */
 			if ((filter & ANIMFILTER_KEYS_MUTED) || (fcu->flag & FCURVE_MUTED)==0) {
 				short replace = -1;