[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38853] branches/soc-2011-tomato/source/ blender/editors/transform/transform_conversions.c: Camera tracking integration

[Sergey Sharybin]

Revision: 38853
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38853
Author:   nazgul
Date:     2011-07-30 14:22:15 +0000 (Sat, 30 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================

- Fixed bug with transforming several markers at the same time.
  (Memory access issue, index was chacging in wrong way).
- Do not check result of BKE_tracking_get_marker -- it should
  always return valid marker.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c

Modified: branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2011-07-30 14:05:48 UTC (rev 38852)
+++ branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c	2011-07-30 14:22:15 UTC (rev 38853)
@@ -5358,28 +5358,26 @@
 		if(TRACK_SELECTED(track) && (track->flag&TRACK_LOCKED)==0) {
 			marker= BKE_tracking_get_marker(track, framenr);
 
-			if(marker) {
-				trackToTransData(sc, td, td2d, tdt, track);
+			trackToTransData(sc, td, td2d, tdt, track);
 
-				td++;
-				td2d++;
-				tdt++;
+			td++;
+			td2d++;
+			tdt++;
 
-				if((marker->flag&MARKER_DISABLED)==0) {
-					if(track->flag&SELECT) {td++; td2d++; tdt+=2;}
-					if(track->pat_flag&SELECT) {td+= 2; td2d+= 2;tdt+=2;}
-				}
+			if((marker->flag&MARKER_DISABLED)==0) {
+				if(track->flag&SELECT) {td++; td2d++; tdt++;}
+				if(track->pat_flag&SELECT) {td+= 2; td2d+= 2;tdt+=2;}
+			}
 
-				if(track->search_flag&SELECT) {
-					td+= 2;
-					td2d+= 2;
-					tdt+= 2;
+			if(track->search_flag&SELECT) {
+				td+= 2;
+				td2d+= 2;
+				tdt+= 2;
 
-					if(marker->flag&MARKER_DISABLED) {
-						td+= 3;
-						td2d+= 3;
-						tdt+= 3;
-					}
+				if(marker->flag&MARKER_DISABLED) {
+					td+= 3;
+					td2d+= 3;
+					tdt+= 3;
 				};
 			}
 		}