[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42401] trunk/blender/source/blender/ blenkernel/intern/tracking.c: Fix of pattern position clamping
Sergey Sharybin
sergey.vfx at gmail.com
Sun Dec 4 15:42:15 CET 2011
Revision: 42401
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42401
Author: nazgul
Date: 2011-12-04 14:42:10 +0000 (Sun, 04 Dec 2011)
Log Message:
-----------
Fix of pattern position clamping
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:08:58 UTC (rev 42400)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c 2011-12-04 14:42:10 UTC (rev 42401)
@@ -128,17 +128,17 @@
}
else if(event==CLAMP_PAT_POS) {
float dim[2];
- sub_v2_v2v2(dim, track->pat_max, pat_min);
+ sub_v2_v2v2(dim, track->pat_max, track->pat_min);
for(a= 0; a<2; a++) {
/* pattern shouldn't be moved outside of search */
if(pat_min[a] < track->search_min[a]) {
track->pat_min[a]= track->search_min[a] - (pat_min[a] - track->pat_min[a]);
- track->pat_max[a]= (pat_min[a] - track->pat_min[a])+dim[a];
+ track->pat_max[a]= track->pat_min[a] + dim[a];
}
if(track->pat_max[a] > track->search_max[a]) {
track->pat_max[a]= track->search_max[a] - (pat_max[a] - track->pat_max[a]);
- track->pat_min[a]= track->pat_max[a]-dim[a] - (pat_min[a] - track->pat_min[a]);
+ track->pat_min[a]= track->pat_max[a] - dim[a];
}
}
}
More information about the Bf-blender-cvs
mailing list