[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47723] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Move all marker placement into a single omp critical section

Sergey Sharybin sergey.vfx at gmail.com
Mon Jun 11 10:06:52 CEST 2012


Revision: 47723
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47723
Author:   nazgul
Date:     2012-06-11 08:06:42 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Move all marker placement into a single omp critical section
Could give small speadup.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/tracking.c

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-06-11 06:51:01 UTC (rev 47722)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-06-11 08:06:42 UTC (rev 47723)
@@ -1767,24 +1767,20 @@
 				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);
 				}
 			}




More information about the Bf-blender-cvs mailing list