griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove unused code and correct comment for track mask AA

Browse Source 
Tip: XXX should be used for such kind of crap which is bad for release
     disabled AA for mask is not such a case.
This commit is contained in:
Sergey Sharybin
2012-06-15 16:07:23 +00:00
parent 927fc897cf
commit 4b8c51d493
2 changed files with 9 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/blenkernel/intern/tracking.c
View File

@@ -831,7 +831,7 @@ static bGPDlayer *track_mask_gpencil_layer_get(MovieTrackingTrack *track)
}
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 @@ static void track_mask_gpencil_layer_rasterize(int frame_width, int frame_height
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 @@ static void reconstruct_update_solve_cb(void *customdata, double progress, const
}
#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)
{

25
source/blender/editors/space_clip/clip_draw.c
View File

@@ -811,6 +811,8 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
}
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,25 +820,10 @@ static void draw_marker_slide_zones(SpaceClip *sc, MovieTrackingTrack *track, Mo
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);
}
}
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);
/* 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);
}
}