[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47967] trunk/blender/source/blender: Remove unused code and correct comment for track mask AA

[Sergey Sharybin]

Revision: 47967
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47967
Author:   nazgul
Date:     2012-06-15 16:07:23 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
Remove unused code and correct comment for track mask AA

Tip: XXX should be used for such kind of crap which is bad for release
     disabled AA for mask is not such a case.

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

Modified: trunk/blender/source/blender/blenkernel/intern/tracking.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-06-15 15:55:37 UTC (rev 47966)
+++ trunk/blender/source/blender/blenkernel/intern/tracking.c	2012-06-15 16:07:23 UTC (rev 47967)
@@ -831,7 +831,7 @@
 }
 
 static void track_mask_gpencil_layer_rasterize(int frame_width, int frame_height,
-											   MovieTrackingMarker *marker, bGPDlayer *layer,
+                                               MovieTrackingMarker *marker, bGPDlayer *layer,
                                                float *mask, int mask_width, int mask_height)
 {
 	bGPDframe *frame = layer->frames.first;
@@ -853,7 +853,8 @@
 					fp[1] = (stroke_points[i].y - marker->search_min[1]) * frame_height / mask_height;
 				}
 
-				PLX_raskterize((float (*)[2])mask_points, stroke->totpoints, mask, mask_width, mask_height, FALSE /* XXX- TODO: make on/off for AA*/);
+				/* TODO: add an option to control wether AA is enabled or not */
+				PLX_raskterize((float (*)[2])mask_points, stroke->totpoints, mask, mask_width, mask_height, FALSE);
 
 				MEM_freeN(mask_points);
 			}
@@ -2869,18 +2870,6 @@
 }
 #endif
 
-#if 0
-static int solve_reconstruction_testbreak_cb(void *customdata)
-{
-	ReconstructProgressData *progressdata = customdata;
-
-	if (progressdata->stop && *progressdata->stop)
-		return TRUE;
-
-	return G.afbreek;
-}
-#endif
-
 void BKE_tracking_reconstruction_solve(MovieReconstructContext *context, short *stop, short *do_update,
                                        float *progress, char *stats_message, int message_size)
 {

Modified: trunk/blender/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/clip_draw.c	2012-06-15 15:55:37 UTC (rev 47966)
+++ trunk/blender/source/blender/editors/space_clip/clip_draw.c	2012-06-15 16:07:23 UTC (rev 47967)
@@ -811,6 +811,8 @@
 	}
 
 	if ((sc->flag & SC_SHOW_MARKER_PATTERN) && ((track->pat_flag & SELECT) == sel || outline)) {
+		int i;
+
 		if (!outline) {
 			if (track->pat_flag & SELECT)
 				glColor3fv(scol);
@@ -818,26 +820,11 @@
 				glColor3fv(col);
 		}
 
-		/* XXX: need to be real check if affine tracking is enabled, but for now not
-		 *      sure how to do this, so assume affine tracker is always enabled */
-		if (TRUE) {
-			int i;
-
-			/* pattern's corners sliding squares */
-			for (i = 0; i < 4; i++) {
-				draw_marker_slide_square(marker->pattern_corners[i][0], marker->pattern_corners[i][1],
-				                         patdx / 1.5f, patdy / 1.5f, outline, px);
-			}
+		/* pattern's corners sliding squares */
+		for (i = 0; i < 4; i++) {
+			draw_marker_slide_square(marker->pattern_corners[i][0], marker->pattern_corners[i][1],
+			                         patdx / 1.5f, patdy / 1.5f, outline, px);
 		}
-		else {
-			/* pattern offset square */
-			draw_marker_slide_square(marker->pattern_corners[3][0], marker->pattern_corners[3][1],
-			                         patdx, patdy, outline, px);
-
-			/* pattern re-sizing triangle */
-			draw_marker_slide_triangle(marker->pattern_corners[1][0], marker->pattern_corners[1][1],
-			                           patdx, patdy, outline, px);
-		}
 	}
 
 	glPopMatrix();