new sequence strip type for masks.

3 files changed, 6 insertions, 2 deletions

diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h
index 23f33729f69..626242c1a8d 100644
--- a/source/blender/makesdna/DNA_mask_types.h
+++ b/source/blender/makesdna/DNA_mask_types.h
@@ -46,6 +46,8 @@ typedef struct Mask {
 	ListBase masklayers;  /* mask layers */
 	int masklay_act;      /* index of active mask layer (-1 == None) */
 	int masklay_tot;      /* total number of mask layers */
+
+	int sfra, efra;       /* frames, used by the sequencer */
 } Mask;
 
 typedef struct MaskParent {
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index 73b6efedd77..161c448476d 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -132,6 +132,7 @@ typedef struct Sequence {
 
 	struct anim *anim;      /* for MOVIE strips */
 	struct MovieClip *clip; /* for MOVIECLIP strips */
+	struct Mask *mask;      /* for MASK strips */
 
 	float effect_fader;
 	float speed_fader;
@@ -305,6 +306,7 @@ enum {
 	SEQ_TYPE_SOUND_RAM   = 4,
 	SEQ_TYPE_SOUND_HD    = 5,
 	SEQ_TYPE_MOVIECLIP   = 6,
+	SEQ_TYPE_MASK        = 7,
 
 	SEQ_TYPE_EFFECT      = 8,
 	SEQ_TYPE_CROSS       = 8,
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index f06a2b6f80a..5465dbf6e3c 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -236,7 +236,7 @@ typedef struct ThemeSpace {
 	char syntaxl[4], syntaxn[4], syntaxb[4]; // syntax for textwindow and nodes
 	char syntaxv[4], syntaxc[4];
 	
-	char movie[4], movieclip[4], image[4], scene[4], audio[4];		// for sequence editor
+	char movie[4], movieclip[4], mask[4], image[4], scene[4], audio[4];		// for sequence editor
 	char effect[4], hpad0[4], transition[4], meta[4];
 	char editmesh_active[4]; 
 
@@ -249,7 +249,7 @@ typedef struct ThemeSpace {
 	char bundle_solid[4];
 	char path_before[4], path_after[4];
 	char camera_path[4];
-	char hpad[7];
+	char hpad[3];
 	
 	char preview_back[4];
 	char preview_stitch_face[4];