Commit: 303e9b4032fcd4f7d1ebf6decdb906189e4b7bcc
Author: Antony Riakiotakis
Date: Wed Apr 29 16:20:38 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB303e9b4032fcd4f7d1ebf6decdb906189e4b7bcc
Fix really stupid own mistake that caused leakage of timers.
===================================================================
M source/blender/editors/animation/anim_ops.c
===================================================================
diff --git a/source/blender/editors/animation/anim_ops.c
b/source/blender/editors/animation/anim_ops.c
index 82dff14..efcc707 100644
--- a/source/blender/editors/animation/anim_ops.c
+++ b/source/blender/editors/animation/anim_ops.c
@@ -215,7 +215,7 @@ static void change_frame_seq_preview_end(bContext *C,
wmOperator *op)
if (op->customdata) {
ChangeFrameData *data = op->customdata;
- WM_event_remove_timer(wm, win, op->customdata);
+ WM_event_remove_timer(wm, win, data->timer);
MEM_freeN(data);
op->customdata = NULL;
}
@@ -234,7 +234,7 @@ static int change_frame_invoke(bContext *C, wmOperator *op,
const wmEvent *event
Scene *scene = CTX_data_scene(C);
ChangeFrameData *data = MEM_callocN(sizeof(ChangeFrameData),
"changeframedata");
- data->timer = WM_event_add_timer(wm, win, TIMER, (1.0 / FPS));
+ data->timer = WM_event_add_timer(wm, win, TIMER, FRA2TIME(1.0));
RNA_int_set(op->ptr, "frame", frame_from_event(C, event));
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
