Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2012-11-11 22:26:39 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2012-11-11 22:26:39 +0400
commit724c55aafaee9078e6f49fd0e50c80d24105a699 (patch)
treeb86951de4aa6cd0b1fbdaa7a805d1b60c7dca568 /source/blender/editors/gpencil
parent7165c352beb58d128949e84b215b3f864f6291c6 (diff)
Fix a stupid warning (due to last minute refactor...).
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r--source/blender/editors/gpencil/gpencil_edit.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 7ddbed85226..dbf04e772f5 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -623,7 +623,7 @@ static void gp_stroke_path_animation_preprocess_gaps(tGpTimingData *gtd, int *nb
}
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 @@ static void gp_stroke_path_animation_add_keyframes(ReportList *reports, PointerR
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 @@ static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu
PointerRNA ptr;
PropertyRNA *prop = NULL;
- float cfra;
int nbr_gaps = 0, i;
if (gtd->mode == GP_STROKECONVERT_TIMING_NONE)
@@ -739,6 +739,8 @@ static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu
}
if (gtd->mode == GP_STROKECONVERT_TIMING_LINEAR) {
+ float cfra;
+
/* Linear extrapolation! */
fcu->extend = FCURVE_EXTRAPOLATE_LINEAR;
@@ -778,7 +780,7 @@ static void gp_stroke_path_animation(bContext *C, ReportList *reports, Curve *cu
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);
}