[Bf-blender-cvs] [3a8a7492121] greasepencil-object: Cleanup: Use always even numbers for samples

[Antonio Vazquez]

Commit: 3a8a74921211c7232c016ae9044876f59575f4c5
Author: Antonio Vazquez
Date:   Fri Mar 30 16:29:17 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3a8a74921211c7232c016ae9044876f59575f4c5

Cleanup: Use always even numbers for samples

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

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 3e8d58b96c9..1234539f97e 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -639,7 +639,11 @@ static void gpencil_vfx_passes(int ob_idx, void *vedata, tGPencilObjectCache *ca
 	 * --------------*/
 	if (cache->vfx_blur_sh) {
 		int samples = stl->vfx[ob_idx].vfx_blur.samples >= 2 ? stl->vfx[ob_idx].vfx_blur.samples : 2;
-		
+		/* be sure is even */
+		if (samples % 2 != 0) {
+			samples++;
+		}
+
 		for (int b = 0; b < samples; b++) {
 			/* make a pin-pong change of framebuffer to acumulate */
 			if (b % 2 == 0) {
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index b55ee7d5244..7cf63364cb9 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -5853,6 +5853,7 @@ 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_update(prop, 0, "rna_Modifier_update");
 }