[Bf-blender-cvs] [773691310f9] master: Fix T64143: Crash when scrubbing in the graph editor

Sergey Sharybin noreply at git.blender.org
Sat May 4 18:54:38 CEST 2019


Commit: 773691310f9479a7de9b01f13fbbdc5d45c1c47e
Author: Sergey Sharybin
Date:   Sat May 4 18:53:59 2019 +0200
Branches: master
https://developer.blender.org/rB773691310f9479a7de9b01f13fbbdc5d45c1c47e

Fix T64143: Crash when scrubbing in the graph editor

===================================================================

M	source/blender/editors/space_clip/clip_ops.c
M	source/blender/editors/space_clip/tracking_ops.c
M	source/blender/editors/space_graph/graph_ops.c
M	source/blender/editors/space_image/image_ops.c
M	source/tools

===================================================================

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
index d96e3148dea..3ee979c1eb0 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit d96e3148deaea3eab7b5dbddfd2bffaa61ad2487
+Subproject commit 3ee979c1eb0752bae62295c78e367660ae084bde



More information about the Bf-blender-cvs mailing list