Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-06-15 20:07:23 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-06-15 20:07:23 +0400
commit4b8c51d4931673daad4047ca690cebd532abc345 (patch)
treea0c7fcbe90901abe72819be4a6b6f56752c79aae /source/blender
parent927fc897cf8d7e6c18571dee2b79b596b5aaffa7 (diff)
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.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/tracking.c17
-rw-r--r--source/blender/editors/space_clip/clip_draw.c25
2 files changed, 9 insertions, 33 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index 7edc240ff0a..b32400586a8 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -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)
{
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index ec709443cfb..9b0c5f6296d 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -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);
}
}