diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-13 20:37:52 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-13 20:37:52 +0400 |
| commit | 6c90a192c60d836b314c24a15547de6acee6aac7 (patch) | |
| tree | 7b1961c8e32e7018cd0d04ab3d2e57faf8fd0762 /source/blender/editors/space_clip | |
| parent | 50d05a2a584d13883568fa9b79922e87cc6b9359 (diff) | |
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
Diffstat (limited to 'source/blender/editors/space_clip')
| -rw-r--r-- | source/blender/editors/space_clip/tracking_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
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)) |