[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20054] branches/blender2.5/blender/source /blender: 2.5 - Bugfixes

[Joshua Leung]

Revision: 20054
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20054
Author:   aligorith
Date:     2009-05-04 12:24:53 +0200 (Mon, 04 May 2009)

Log Message:
-----------
2.5 - Bugfixes

* Loading files saved with 2.5 works again now without crashing. Was crashing when trying to load Grease Pencil data (even though there was none)
* Fixed some msvc compiler warnings in own code

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/BKE_fcurve.h
    branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
    branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_fcurve.h	2009-05-04 10:04:46 UTC (rev 20053)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_fcurve.h	2009-05-04 10:24:53 UTC (rev 20054)
@@ -127,7 +127,7 @@
 struct FCurve *list_find_fcurve(ListBase *list, const char rna_path[], const int array_index);
 
 /* test if there is a keyframe at cfra */
-int on_keyframe_fcurve(struct FCurve *fcu, float cfra);
+short on_keyframe_fcurve(struct FCurve *fcu, float cfra);
 
 /* get the time extents for F-Curve */
 void calc_fcurve_range(struct FCurve *fcu, float *min, float *max);

Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c	2009-05-04 10:04:46 UTC (rev 20053)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c	2009-05-04 10:24:53 UTC (rev 20054)
@@ -175,15 +175,16 @@
 	return NULL;
 }
 
-int on_keyframe_fcurve(FCurve *fcu, float cfra)
+short on_keyframe_fcurve(FCurve *fcu, float cfra)
 {
 	BezTriple *bezt;
-	int i;
+	unsigned i;
 
 	bezt= fcu->bezt;
-	for (i=0; i<fcu->totvert; i++, bezt++)
-		if(IS_EQ(bezt->vec[1][0], cfra))
+	for (i=0; i<fcu->totvert; i++, bezt++) {
+		if (IS_EQ(bezt->vec[1][0], cfra))
 			return 1;
+	}
 	
 	return 0;
 }

Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-05-04 10:04:46 UTC (rev 20053)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c	2009-05-04 10:24:53 UTC (rev 20054)
@@ -4090,6 +4090,10 @@
 	bGPDframe *gpf;
 	bGPDstroke *gps;
 	
+	/* we must firstly have some grease-pencil data to link! */
+	if (gpd == NULL)
+		return;
+	
 	/* relink layers */
 	link_list(fd, &gpd->layers);