[Bf-blender-cvs] [739960a0e1a] greasepencil-object: Set all default HSV range to 1

[Antonio Vazquez]

Commit: 739960a0e1aa54a4901a23ed130284d4711610f0
Author: Antonio Vazquez
Date:   Mon Jul 24 20:24:49 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB739960a0e1aa54a4901a23ed130284d4711610f0

Set all default HSV range to 1

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

M	source/blender/blenkernel/intern/gpencil.c
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_gpencilcolor.c

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

diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 65440523679..6177ca5afaa 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -1921,24 +1921,26 @@ void ED_gpencil_tint_modifier(int UNUSED(id), GpencilTintModifierData *mmd, bGPD
 void ED_gpencil_color_modifier(int UNUSED(id), GpencilColorModifierData *mmd, bGPDlayer *gpl, bGPDstroke *gps)
 {
 	PaletteColor *palcolor;
-	float hsv[3];
+	float hsv[3], factor[3];
 	if (!is_stroke_affected_by_modifier(mmd->layername, mmd->passindex, 1, gpl, gps,
 		(int)mmd->flag & GP_COLOR_INVERSE_LAYER, (int)mmd->flag & GP_COLOR_INVERSE_PASS)) {
 		return;
 	}
 
 	palcolor = gps->palcolor;
+	copy_v3_v3(factor, mmd->hsv);
+	add_v3_fl(factor, -1.0f);
 
 	rgb_to_hsv_v(palcolor->rgb, hsv);
-	add_v3_v3(hsv, mmd->hsv);
+	add_v3_v3(hsv, factor);
+	CLAMP3(hsv, 0.0f, 1.0f);
 	hsv_to_rgb_v(hsv, palcolor->rgb);
 
 	rgb_to_hsv_v(palcolor->fill, hsv);
-	add_v3_v3(hsv, mmd->hsv);
+	add_v3_v3(hsv, factor);
+	CLAMP3(hsv, 0.0f, 1.0f);
 	hsv_to_rgb_v(hsv, palcolor->fill);
 
-	CLAMP3(palcolor->rgb, 0.0f, 1.0f);
-	CLAMP3(palcolor->fill, 0.0f, 1.0f);
 }
 
 /* opacity strokes */
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index bd44b51adc8..94f5882f328 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -315,7 +315,7 @@ EnumPropertyItem rna_enum_gpencil_lockshift_items[] = {
 #  include "ABC_alembic.h"
 #endif
 
-static void rna_GPencilOpacity_factor_range(PointerRNA *ptr, float *min, float *max,
+static void rna_GPencil_factor_range(PointerRNA *ptr, float *min, float *max,
 	float *softmin, float *softmax)
 {
 	*min = 0.0f;
@@ -5024,22 +5024,22 @@ static void rna_def_modifier_gpencilcolor(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop = RNA_def_property(srna, "hue", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_range(prop, -1.0, 1.0);
-	RNA_def_property_ui_range(prop, -1.0, 1.0, 0.1, 3);
+	RNA_def_property_range(prop, 0.0, 2.0);
+	RNA_def_property_ui_range(prop, 0.0, 2.0, 0.1, 3);
 	RNA_def_property_float_sdna(prop, NULL, "hsv[0]");
 	RNA_def_property_ui_text(prop, "Hue", "Color Hue");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop = RNA_def_property(srna, "saturation", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_range(prop, -1.0, 1.0);
-	RNA_def_property_ui_range(prop, -1.0, 1.0, 0.1, 3);
+	RNA_def_property_range(prop, 0.0, 2.0);
+	RNA_def_property_ui_range(prop, 0.0, 2.0, 0.1, 3);
 	RNA_def_property_float_sdna(prop, NULL, "hsv[1]");
 	RNA_def_property_ui_text(prop, "Saturation", "Color Saturation");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
 	prop = RNA_def_property(srna, "value", PROP_FLOAT, PROP_NONE);
-	RNA_def_property_range(prop, -1.0, 1.0);
-	RNA_def_property_ui_range(prop, -1.0, 1.0, 0.1, 3);
+	RNA_def_property_range(prop, 0.0, 2.0);
+	RNA_def_property_ui_range(prop, 0.0, 2.0, 0.1, 3);
 	RNA_def_property_float_sdna(prop, NULL, "hsv[2]");
 	RNA_def_property_ui_text(prop, "Value", "Color Value");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
@@ -5083,7 +5083,7 @@ static void rna_def_modifier_gpencilopacity(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "factor");
-	RNA_def_property_float_funcs(prop, NULL, NULL, "rna_GPencilOpacity_factor_range");
+	RNA_def_property_float_funcs(prop, NULL, NULL, "rna_GPencil_factor_range");
 	RNA_def_property_ui_range(prop, 0, 2.0, 0.1, 3);
 	RNA_def_property_ui_text(prop, "Factor", "Factor of opacity");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
diff --git a/source/blender/modifiers/intern/MOD_gpencilcolor.c b/source/blender/modifiers/intern/MOD_gpencilcolor.c
index 3e97930488e..c92460157ec 100644
--- a/source/blender/modifiers/intern/MOD_gpencilcolor.c
+++ b/source/blender/modifiers/intern/MOD_gpencilcolor.c
@@ -49,7 +49,7 @@ static void initData(ModifierData *md)
 {
 	GpencilColorModifierData *gpmd = (GpencilColorModifierData *)md;
 	gpmd->passindex = 0;
-	ARRAY_SET_ITEMS(gpmd->hsv, 0.0f, 0.0f, 0.0f);
+	ARRAY_SET_ITEMS(gpmd->hsv, 1.0f, 1.0f, 1.0f);
 	gpmd->layername[0] = '\0';
 	gpmd->flag |= GP_COLOR_CREATE_COLORS;