[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27250] trunk/blender/source/blender/ editors: fix for more crashes with baked fcurves

[Campbell Barton]

Revision: 27250
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27250
Author:   campbellbarton
Date:     2010-03-03 14:20:18 +0100 (Wed, 03 Mar 2010)

Log Message:
-----------
fix for more crashes with baked fcurves

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/keyframes_general.c
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_generics.c

Modified: trunk/blender/source/blender/editors/animation/keyframes_general.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframes_general.c	2010-03-03 12:53:26 UTC (rev 27249)
+++ trunk/blender/source/blender/editors/animation/keyframes_general.c	2010-03-03 13:20:18 UTC (rev 27250)
@@ -372,6 +372,9 @@
 	tempFrameValCache *value_cache, *fp;
 	int sfra, range;
 	int i, n, nIndex;
+
+	if(fcu->bezt==NULL) /* ignore baked */
+		return NULL;
 	
 	/* find selected keyframes... once pair has been found, add keyframes  */
 	for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-03-03 12:53:26 UTC (rev 27249)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2010-03-03 13:20:18 UTC (rev 27250)
@@ -2912,7 +2912,7 @@
 
 	/* allocate memory for the cache */
 	// TODO: investigate using BezTriple columns instead?
-	if (fcu->totvert == 0)
+	if (fcu->totvert == 0 || fcu->bezt==NULL)
 		return;
 	selcache= MEM_callocN(sizeof(float)*fcu->totvert, "FCurveSelFrameNums");
 	len= 0;

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2010-03-03 12:53:26 UTC (rev 27249)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2010-03-03 13:20:18 UTC (rev 27250)
@@ -323,10 +323,13 @@
 
 static int fcu_test_selected(FCurve *fcu)
 {
-	BezTriple *bezt;
+	BezTriple *bezt= fcu->bezt;
 	int i;
 
-	for (i=0, bezt=fcu->bezt; i < fcu->totvert; i++, bezt++) {
+	if(bezt==NULL) /* ignore baked */
+		return 0;
+
+	for (i=0; i < fcu->totvert; i++, bezt++) {
 		if (BEZSELECTED(bezt)) return 1;
 	}