From 6c90a192c60d836b314c24a15547de6acee6aac7 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 13 Dec 2011 16:37:52 +0000 Subject: Do not switch to safe malloc if tracking sequence Malloc is getting to be safe on sequence tracking by the jobs system, so no additional set up are necessary. This hopefully fixes crash on OSX with OpenMP enabled when compiling by older gcc --- source/blender/editors/space_clip/tracking_ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender/editors/space_clip') diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index 3d004ab73da..b0e7f1b4def 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1302,7 +1302,7 @@ static int track_markers_initjob(bContext *C, TrackMarkersJob *tmj, int backward else if(settings->speed==TRACKING_SPEED_DOUBLE) tmj->delay/= 2; } - tmj->context= BKE_tracking_context_new(clip, &sc->user, backwards, 1); + tmj->context= BKE_tracking_context_new(clip, &sc->user, backwards, 1, 1); clip->tracking_context= tmj->context; @@ -1413,7 +1413,7 @@ static int track_markers_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; /* do not disable tracks due to threshold when tracking frame-by-frame */ - context= BKE_tracking_context_new(clip, &sc->user, backwards, sequence); + context= BKE_tracking_context_new(clip, &sc->user, backwards, sequence, sequence); while(framenr != efra) { if(!BKE_tracking_next(context)) -- cgit v1.2.3