[Bf-blender-cvs] [e21a7b3] master: Fix T39546: blender crash on open recent file, when tracking is still in progress

Sergey Sharybin noreply at git.blender.org
Tue Apr 1 14:46:04 CEST 2014


Commit: e21a7b32f9d54dcf1091ce02989921566c02f80f
Author: Sergey Sharybin
Date:   Tue Apr 1 18:43:49 2014 +0600
https://developer.blender.org/rBe21a7b32f9d54dcf1091ce02989921566c02f80f

Fix T39546: blender crash on open recent file, when tracking is still in progress

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

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

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

diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c
index c59b6b8..1c2933b 100644
--- a/source/blender/editors/space_clip/tracking_ops.c
+++ b/source/blender/editors/space_clip/tracking_ops.c
@@ -1307,10 +1307,13 @@ static void track_markers_updatejob(void *tmv)
 static void track_markers_endjob(void *tmv)
 {
 	TrackMarkersJob *tmj = (TrackMarkersJob *)tmv;
+	wmWindowManager *wm = tmj->main->wm.first;
 
 	tmj->clip->tracking_context = NULL;
 	tmj->scene->r.cfra = BKE_movieclip_remap_clip_to_scene_frame(tmj->clip, tmj->lastfra);
-	ED_update_for_newframe(tmj->main, tmj->scene, 0);
+	if (wm != NULL) {
+		ED_update_for_newframe(tmj->main, tmj->scene, 0);
+	}
 
 	BKE_tracking_context_sync(tmj->context);
 	BKE_tracking_context_finish(tmj->context);




More information about the Bf-blender-cvs mailing list