[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42402] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Small code cleanup of tracking.c

Sergey Sharybin sergey.vfx at gmail.com
Sun Dec 4 15:42:21 CET 2011


Revision: 42402
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42402
Author:   nazgul
Date:     2011-12-04 14:42:21 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Small code cleanup of tracking.c

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	2011-12-04 14:42:10 UTC (rev 42401)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2011-12-04 14:42:21 UTC (rev 42402)
@@ -791,7 +791,7 @@
 						patx= (int)((track->pat_max[0]-track->pat_min[0])*width);
 						paty= (int)((track->pat_max[1]-track->pat_min[1])*height);
 
-						if(track->tracker==TRACKER_KLT || track->tracker==TRACKER_HYBRID) {
+						if(ELEM(track->tracker, TRACKER_KLT, TRACKER_HYBRID)) {
 							float search_size_x= (track->search_max[0]-track->search_min[0])*width;
 							float search_size_y= (track->search_max[1]-track->search_min[1])*height;
 							float pattern_size_x= (track->pat_max[0]-track->pat_min[0])*width;
@@ -1184,7 +1184,7 @@
 			   marker->pos[1]<margin[1] || marker->pos[1]>1.0f-margin[1]) {
 				onbound= 1;
 			}
-			else if(track->tracker==TRACKER_KLT || track->tracker==TRACKER_HYBRID) {
+			else if(ELEM(track->tracker, TRACKER_KLT, TRACKER_HYBRID)) {
 				float *patch_new;
 
 				if(need_readjust) {




More information about the Bf-blender-cvs mailing list