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:
authorCampbell Barton <ideasman42@gmail.com>2012-05-27 15:22:06 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-27 15:22:06 +0400
commitaa6301674471500f74d3984d6d17d82ad5e8724f (patch)
tree245363f11d0d2cc388891e225a018f8574c2401c /source/blender/editors/screen
parent405f6a7c77c597f218796c36cd09fd0250c534e1 (diff)
when SCREEN_OT_keyframe_jump fails dont send notifiers or call sound_seek_scene
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_ops.c26
1 files changed, 15 insertions, 11 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index ffcd8fde3dc..8baca253519 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -1959,20 +1959,24 @@ static int keyframe_jump_exec(bContext *C, wmOperator *op)
cfra = ak->cfra;
}
}
- } while ((ak != NULL) && (done == 0));
-
- /* any success? */
- if (done == 0)
- BKE_report(op->reports, RPT_INFO, "No more keyframes to jump to in this direction");
-
+ } while ((ak != NULL) && (done == FALSE));
+
/* free temp stuff */
BLI_dlrbTree_free(&keys);
-
- sound_seek_scene(bmain, scene);
- WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
-
- return OPERATOR_FINISHED;
+ /* any success? */
+ if (done == FALSE) {
+ BKE_report(op->reports, RPT_INFO, "No more keyframes to jump to in this direction");
+
+ return OPERATOR_CANCELLED;
+ }
+ else {
+ sound_seek_scene(bmain, scene);
+
+ WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
+
+ return OPERATOR_FINISHED;
+ }
}
static void SCREEN_OT_keyframe_jump(wmOperatorType *ot)