[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52109] trunk/blender/source/blender/ editors/gpencil/gpencil_edit.c: Fix a stupid warning ( due to last minute refactor...).

Bastien Montagne montagne29 at wanadoo.fr
Sun Nov 11 19:26:39 CET 2012


Revision: 52109
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52109
Author:   mont29
Date:     2012-11-11 18:26:39 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
Fix a stupid warning (due to last minute refactor...).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/gpencil/gpencil_edit.c

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c	2012-11-11 18:06:10 UTC (rev 52108)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c	2012-11-11 18:26:39 UTC (rev 52109)
@@ -623,7 +623,7 @@
 }
 
 static void gp_stroke_path_animation_add_keyframes(ReportList *reports, PointerRNA ptr, PropertyRNA *prop, FCurve *fcu,
-                                                   Curve *cu, tGpTimingData *gtd, float cfra, float time_range,
+                                                   Curve *cu, tGpTimingData *gtd, float time_range,
                                                    int nbr_gaps, float tot_gaps_time)
 {
 	/* Use actual recorded timing! */
@@ -638,6 +638,7 @@
 	int nbr_done_gaps = 0;
 
 	int i;
+	float cfra;
 
 	/* This is a bit tricky, as:
 	 * - We can't add arbitrarily close points on FCurve (in time).
@@ -709,7 +710,6 @@
 	PointerRNA ptr;
 	PropertyRNA *prop = NULL;
 
-	float cfra;
 	int nbr_gaps = 0, i;
 
 	if (gtd->mode == GP_STROKECONVERT_TIMING_NONE)
@@ -739,6 +739,8 @@
 	}
 
 	if (gtd->mode == GP_STROKECONVERT_TIMING_LINEAR) {
+		float cfra;
+
 		/* Linear extrapolation! */
 		fcu->extend = FCURVE_EXTRAPOLATE_LINEAR;
 
@@ -778,7 +780,7 @@
 			printf("Starting keying!\n");
 		}
 
-		gp_stroke_path_animation_add_keyframes(reports, ptr, prop, fcu, cu, gtd, cfra, time_range,
+		gp_stroke_path_animation_add_keyframes(reports, ptr, prop, fcu, cu, gtd, time_range,
 		                                       nbr_gaps, tot_gaps_time);
 
 	}




More information about the Bf-blender-cvs mailing list