[Bf-blender-cvs] [78c0be99877] master: Fix T70452: Crash when clicking "Solve Camera Motion" in Motion Tracking

Sergey Sharybin noreply at git.blender.org
Mon Oct 7 15:43:24 CEST 2019


Commit: 78c0be99877b02a7cd568e868e512d4762a8256f
Author: Sergey Sharybin
Date:   Mon Oct 7 15:41:30 2019 +0200
Branches: master
https://developer.blender.org/rB78c0be99877b02a7cd568e868e512d4762a8256f

Fix T70452: Crash when clicking "Solve Camera Motion" in Motion Tracking

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

M	source/blender/editors/space_clip/tracking_ops_solve.c

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

diff --git a/source/blender/editors/space_clip/tracking_ops_solve.c b/source/blender/editors/space_clip/tracking_ops_solve.c
index 1d2fc239a89..7e2671382b9 100644
--- a/source/blender/editors/space_clip/tracking_ops_solve.c
+++ b/source/blender/editors/space_clip/tracking_ops_solve.c
@@ -118,7 +118,11 @@ static void solve_camera_freejob(void *scv)
   MovieClip *clip = scj->clip;
   int solved;
 
-  WM_set_locked_interface(scj->wm, false);
+  /* WindowManager is missing in the job when initialization is incomplete.
+   * In this case the interface is not locked either. */
+  if (scj->wm != NULL) {
+    WM_set_locked_interface(scj->wm, false);
+  }
 
   if (!scj->context) {
     /* job weren't fully initialized due to some error */



More information about the Bf-blender-cvs mailing list