From 638211d4e6c3cc291d2c3fffcc35c9bfe7a2df51 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 11 Jun 2012 08:06:42 +0000 Subject: [PATCH] Move all marker placement into a single omp critical section Could give small speadup. --- source/blender/blenkernel/intern/tracking.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index b4ee4f733e7..a3d66012303 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1767,24 +1767,20 @@ int BKE_tracking_next(MovieTrackingContext *context) marker_new.flag |= MARKER_TRACKED; marker_new.framenr = nextfra; - if (context->first_time) { - #pragma omp critical - { + #pragma omp critical + { + if (context->first_time) { /* check if there's no keyframe/tracked markers before tracking marker. * if so -- create disabled marker before currently tracking "segment" */ + put_disabled_marker(track, &marker_new, !context->backwards, 0); } - } - #pragma omp critical - { + /* insert currently tracked marker */ BKE_tracking_insert_marker(track, &marker_new); - } - /* make currently tracked segment be finished with disabled marker */ - #pragma omp critical - { + /* make currently tracked segment be finished with disabled marker */ put_disabled_marker(track, &marker_new, context->backwards, 0); } }