[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37915] branches/soc-2011-tomato/source/ blender: Camera tracking integration

[Sergey Sharybin]

Revision: 37915
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37915
Author:   nazgul
Date:     2011-06-28 16:24:18 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Camera tracking integration
===========================

- Fixed typo in marker state cache line offset.
- Do not try to track disabled markers.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-06-28 15:59:46 UTC (rev 37914)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c	2011-06-28 16:24:18 UTC (rev 37915)
@@ -558,7 +558,7 @@
 	while(track) {
 		MovieTrackingMarker *marker= BKE_tracking_get_marker(track, curfra);
 
-		if(marker && marker->framenr==curfra) {
+		if(marker && (marker->flag&MARKER_DISABLED)==0 && marker->framenr==curfra) {
 #ifdef WITH_LIBMV
 			int width, height, pos[2];
 			float *patch= acquire_search_floatbuf(ibuf, track, marker, &width, &height, pos);

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c	2011-06-28 15:59:46 UTC (rev 37914)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c	2011-06-28 16:24:18 UTC (rev 37915)
@@ -127,7 +127,7 @@
 				if(framenr!=i) glColor4ub(128, 128, 0, 96);
 				else glColor4ub(255, 255, 0, 96);
 
-				glRecti((i-sfra-1)*framelen, 0, (i-sfra)*framelen, 4);
+				glRecti((i-sfra)*framelen, 0, (i-sfra+1)*framelen, 4);
 			}
 		}
 	}