[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49445] trunk/blender/source/blender: - disable mask drawing in the sequencer, this isn' t usable yet and likely wont be working in release.

[Campbell Barton]

Revision: 49445
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49445
Author:   campbellbarton
Date:     2012-08-01 12:59:38 +0000 (Wed, 01 Aug 2012)
Log Message:
-----------
- 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.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h
    trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
    trunk/blender/source/blender/makesdna/DNA_node_types.h
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h	2012-08-01 12:21:23 UTC (rev 49444)
+++ trunk/blender/source/blender/compositor/operations/COM_MaskOperation.h	2012-08-01 12:59:38 UTC (rev 49445)
@@ -51,7 +51,7 @@
 	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 @@
 	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);

Modified: trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2012-08-01 12:21:23 UTC (rev 49444)
+++ trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c	2012-08-01 12:59:38 UTC (rev 49445)
@@ -990,8 +990,13 @@
 	/* 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) {

Modified: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h	2012-08-01 12:21:23 UTC (rev 49444)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h	2012-08-01 12:59:38 UTC (rev 49445)
@@ -762,4 +762,6 @@
 #define CMP_NODE_BLUR_ASPECT_Y			1
 #define CMP_NODE_BLUR_ASPECT_X			2
 
+#define CMP_NODE_MASK_MBLUR_SAMPLES_MAX 64
+
 #endif

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-08-01 12:21:23 UTC (rev 49444)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-08-01 12:59:38 UTC (rev 49445)
@@ -3164,7 +3164,7 @@
 
 	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");