diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-04 19:53:59 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-05-04 19:53:59 +0300 |
commit | 773691310f9479a7de9b01f13fbbdc5d45c1c47e (patch) | |
tree | 35431153f13931dc2858bea4b5cb09fa1350cd53 | |
parent | 7595c9ecdafc711c29c6ea8b019c67d3ff0421ad (diff) |
Fix T64143: Crash when scrubbing in the graph editor
-rw-r--r-- | source/blender/editors/space_clip/clip_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_graph/graph_ops.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 | ||||
m--------- | source/tools | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c index 3f971c4444a..8b3f221f3a5 100644 --- a/source/blender/editors/space_clip/clip_ops.c +++ b/source/blender/editors/space_clip/clip_ops.c @@ -971,7 +971,7 @@ static void change_frame_apply(bContext *C, wmOperator *op) SUBFRA = 0.0f; /* do updates */ - BKE_sound_seek_scene(CTX_data_main(C), scene); + BKE_sound_update_and_seek(CTX_data_main(C), CTX_data_depsgraph(C)); WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene); } diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 18d48b426e0..441e65cefe4 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1350,7 +1350,7 @@ static int frame_jump_exec(bContext *C, wmOperator *op) if (CFRA != sc->user.framenr) { CFRA = sc->user.framenr; - BKE_sound_seek_scene(CTX_data_main(C), scene); + BKE_sound_update_and_seek(CTX_data_main(C), CTX_data_depsgraph(C)); WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene); } diff --git a/source/blender/editors/space_graph/graph_ops.c b/source/blender/editors/space_graph/graph_ops.c index 5c7035a4c04..054a1e3d8ee 100644 --- a/source/blender/editors/space_graph/graph_ops.c +++ b/source/blender/editors/space_graph/graph_ops.c @@ -105,7 +105,7 @@ static void graphview_cursor_apply(bContext *C, wmOperator *op) } SUBFRA = 0.0f; - BKE_sound_seek_scene(bmain, scene); + BKE_sound_update_and_seek(bmain, CTX_data_depsgraph(C)); } /* set the cursor value */ diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index cec2e1c68d9..0710ecf3bd6 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -3542,7 +3542,7 @@ static void change_frame_apply(bContext *C, wmOperator *op) SUBFRA = 0.0f; /* do updates */ - BKE_sound_seek_scene(CTX_data_main(C), scene); + BKE_sound_update_and_seek(CTX_data_main(C), CTX_data_depsgraph(C)); WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene); } diff --git a/source/tools b/source/tools -Subproject d96e3148deaea3eab7b5dbddfd2bffaa61ad248 +Subproject 3ee979c1eb0752bae62295c78e367660ae084bd |