Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-06-11 12:06:42 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-06-11 12:06:42 +0400
commit638211d4e6c3cc291d2c3fffcc35c9bfe7a2df51 (patch)
tree059aca62b7bcbf798cf2c5f1483fd195b3b50dc5 /source/blender/blenkernel/intern/tracking.c
parent05c48fe7d88fc6e92d4fd45177872680a7b71bbd (diff)
Move all marker placement into a single omp critical section
Could give small speadup.
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
-rw-r--r--source/blender/blenkernel/intern/tracking.c16
1 files 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);
}
}