diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 01:16:39 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2009-08-10 01:16:39 +0400 |
| commit | 6c5c58e05799f2b593cd81fcff57e6ef72ad57fb (patch) | |
| tree | 8add929ef94d03fc69aecce6ef2baf283505782f /source/blender/editors/animation/anim_ops.c | |
| parent | c1ca2ab5dceb8d5355215a3c7a80b171f394e487 (diff) | |
2.5: Sound branch merge!
See mailing list for additional information.
Diffstat (limited to 'source/blender/editors/animation/anim_ops.c')
| -rw-r--r-- | source/blender/editors/animation/anim_ops.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/editors/animation/anim_ops.c b/source/blender/editors/animation/anim_ops.c index 9c039693b72..ffa44e60d00 100644 --- a/source/blender/editors/animation/anim_ops.c +++ b/source/blender/editors/animation/anim_ops.c @@ -56,6 +56,8 @@ #include "ED_markers.h" #include "ED_screen.h" +#include "BKE_sound.h" + /* ********************** frame change operator ***************************/ /* Set any flags that are necessary to indicate modal time-changing operation */ @@ -91,6 +93,8 @@ static void change_frame_apply(bContext *C, wmOperator *op) if (cfra < MINAFRAME) cfra= MINAFRAME; CFRA= cfra; + sound_scrub(C); + WM_event_add_notifier(C, NC_SCENE|ND_FRAME, scene); } @@ -121,6 +125,7 @@ static int change_frame_exec(bContext *C, wmOperator *op) change_frame_apply(C, op); change_frame_exit(C, op); + return OPERATOR_FINISHED; } |