Masking support for motion tracks

Added option to use Grease Pencil datablock as a mask for pattern
when doing motion tracking. Option could be found in Tracking Settings
panel.

All strokes would be rasterized separately from each other and every
stroke is treating as a closed spline.

Also added option to apply a mask on track preview which is situated
just after B/B/W channel button under track preview.

1 files changed, 3 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_movieclip_types.h b/source/blender/makesdna/DNA_movieclip_types.h
index b5ab7898bd9..19004dbc8b8 100644
--- a/source/blender/makesdna/DNA_movieclip_types.h
+++ b/source/blender/makesdna/DNA_movieclip_types.h
@@ -90,7 +90,8 @@ typedef struct MovieClip {
 } MovieClip;
 
 typedef struct MovieClipScopes {
-	int ok;                         /* 1 means scopes are ok and recalculation is unneeded */
+	short ok;                       /* 1 means scopes are ok and recalculation is unneeded */
+	short use_track_mask;           /* whether track's mask should be applied on preview */
 	int track_preview_height;       /* height of track preview widget */
 	int frame_width, frame_height;  /* width and height of frame for which scopes are calculated */
 	struct MovieTrackingMarker undist_marker;   /* undistorted position of marker used for pattern sampling */
@@ -98,7 +99,7 @@ typedef struct MovieClipScopes {
 	struct ImBuf *track_preview;    /* ImBuf displayed in track preview */
 	float track_pos[2];             /* sub-pizel position of marker in track ImBuf */
 	short track_disabled;           /* active track is disabled, special notifier should be drawn */
-	char pad[2];
+	short track_locked;             /* active track is locked, no transformation should be allowed */
 	int framenr;                    /* frame number scopes are created for */
 	struct MovieTrackingTrack *track;   /* track scopes are created for */
 	struct MovieTrackingMarker *marker; /* marker scopes are created for */