[Bf-blender-cvs] [d983eb44bc0] greasepencil-object: Allow zero samples for VFX Blur

[Antonio Vazquez]

Commit: d983eb44bc00cbfe2757f55df8ab470136d5cf01
Author: Antonio Vazquez
Date:   Mon Apr 2 17:20:02 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBd983eb44bc00cbfe2757f55df8ab470136d5cf01

Allow zero samples for VFX Blur

When the number of samples is set to zero, the blur is dissabled, but this can be used to get effects animating the samples parameter.

If the zero is not a valid value, it is impossible to disable the blur with only this parameter.

===================================================================

M	source/blender/draw/engines/gpencil/gpencil_engine.c
M	source/blender/makesrna/intern/rna_modifier.c

===================================================================

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index 0518093cf3b..f9daea039b7 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -638,7 +638,7 @@ static void gpencil_vfx_passes(int ob_idx, void *vedata, tGPencilObjectCache *ca
 	 * Blur passes (use several passes to get better quality)
 	 * --------------*/
 	if (cache->vfx_blur_sh) {
-		int samples = stl->vfx[ob_idx].vfx_blur.samples >= 2 ? stl->vfx[ob_idx].vfx_blur.samples : 2;
+		int samples = stl->vfx[ob_idx].vfx_blur.samples;
 		/* be sure is even */
 		if (samples % 2 != 0) {
 			samples++;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 7cf63364cb9..d77a84eebdc 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5852,9 +5852,9 @@ static void rna_def_modifier_gpencilblur(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "samples");
-	RNA_def_property_range(prop, 2, 32);
-	RNA_def_property_ui_range(prop, 2, 32, 2, -1);
-	RNA_def_property_ui_text(prop, "Samples", "Number of Blur Samples");
+	RNA_def_property_range(prop, 0, 32);
+	RNA_def_property_ui_range(prop, 0, 32, 2, -1);
+	RNA_def_property_ui_text(prop, "Samples", "Number of Blur Samples (zero, disable blur)");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }