- disable mask drawing in the sequencer, this isn't usable yet and likely wont be working in release.

- use define for max mask mblur samples, increase to 64 max.

4 files changed, 11 insertions, 4 deletions

diff --git a/source/blender/compositor/operations/COM_MaskOperation.h b/source/blender/compositor/operations/COM_MaskOperation.h
index 859420bd650..ac864c9e131 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.h
+++ b/source/blender/compositor/operations/COM_MaskOperation.h
@@ -51,7 +51,7 @@ protected:
 	bool m_do_smooth;
 	bool m_do_feather;
 
-	struct MaskRasterHandle *m_rasterMaskHandles[32];
+	struct MaskRasterHandle *m_rasterMaskHandles[CMP_NODE_MASK_MBLUR_SAMPLES_MAX];
 	unsigned int             m_rasterMaskHandleTot;
 
 	/**
@@ -81,7 +81,7 @@ public:
 	void setSmooth(bool smooth) { this->m_do_smooth = smooth; }
 	void setFeather(bool feather) { this->m_do_feather = feather; }
 
-	void setMotionBlurSamples(int samples) { this->m_rasterMaskHandleTot = max(1, samples); }
+	void setMotionBlurSamples(int samples) { this->m_rasterMaskHandleTot = min(max(1, samples), CMP_NODE_MASK_MBLUR_SAMPLES_MAX); }
 	void setMotionBlurShutter(float shutter) { this->m_frame_shutter = shutter; }
 
 	void executePixel(float *color, float x, float y, PixelSampler sampler);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index e52c7fff5ca..9cbb9006187 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -990,8 +990,13 @@ void draw_image_seq(const bContext *C, Scene *scene, ARegion *ar, SpaceSeq *sseq
 	/* draw grease-pencil (screen aligned) */
 	draw_gpencil_view2d(C, 0);
 
+
+
+	/* NOTE: sequencer mask editing isnt finished, the draw code is working but editing not,
+	 * for now just disable drawing since the strip frame will likely be offset */
+
 	//if (sc->mode == SC_MODE_MASKEDIT) {
-	if (sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
+	if (0 && sseq->mainb == SEQ_DRAW_IMG_IMBUF) {
 		Mask *mask = BKE_sequencer_mask_get(scene);
 
 		if (mask) {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 5b8445465a2..731f44d2564 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -762,4 +762,6 @@ typedef struct NodeTrackPosData {
 #define CMP_NODE_BLUR_ASPECT_Y			1
 #define CMP_NODE_BLUR_ASPECT_X			2
 
+#define CMP_NODE_MASK_MBLUR_SAMPLES_MAX 64
+
 #endif
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index e6d89bc6e04..7bbe277f679 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3164,7 +3164,7 @@ static void def_cmp_mask(StructRNA *srna)
 
 	prop = RNA_def_property(srna, "motion_blur_samples", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom2");
-	RNA_def_property_range(prop, 1, 32);
+	RNA_def_property_range(prop, 1, CMP_NODE_MASK_MBLUR_SAMPLES_MAX);
 	RNA_def_property_ui_text(prop, "Samples", "Number of motion blur samples");
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");