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:
authorTon Roosendaal <ton@blender.org>2009-01-14 19:37:52 +0300
committerTon Roosendaal <ton@blender.org>2009-01-14 19:37:52 +0300
commit30e851b8a536194a78a674dd33fad9a939122ea1 (patch)
tree2956594b04f24d58cc63f9c1bdecf24cfb9daf1c /source/blender/editors/gpencil
parent9aec7aaf6c560ddc0c2dd1c553c809f9b1e706d5 (diff)
2.5
A small round of warning cleanups; unused variables, missing headers and some const types.
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r--source/blender/editors/gpencil/editaction_gpencil.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c
index 79057b95fd1..e23f8500571 100644
--- a/source/blender/editors/gpencil/editaction_gpencil.c
+++ b/source/blender/editors/gpencil/editaction_gpencil.c
@@ -58,9 +58,10 @@
#include "PIL_time.h"
#include "ED_anim_api.h"
+#include "ED_gpencil.h"
#include "ED_keyframes_edit.h"
#include "ED_keyframes_draw.h"
-#include "ED_gpencil.h"
+#include "ED_markers.h"
#include "ED_util.h"
#include "ED_types.h"
@@ -71,7 +72,6 @@ static void actdata_filter() {}
static void BIF_undo_push() {}
static void error() {}
static void *get_action_context() {return NULL;}
-static int find_nearest_marker_time() {return 1;}
/* XXX */
@@ -600,7 +600,7 @@ static short snap_gpf_cframe (bGPDframe *gpf, Scene *scene)
static short snap_gpf_nearmarker (bGPDframe *gpf, Scene *scene)
{
if (gpf->flag & GP_FRAME_SELECT)
- gpf->framenum= (int)find_nearest_marker_time((float)gpf->framenum);
+ gpf->framenum= (int)find_nearest_marker_time(&scene->markers, (float)gpf->framenum);
return 0;
}