[Bf-blender-cvs] [88d67b6c6d9] greasepencil-object: GPencil: Revert Opacity/Tint limit of 1.0 for factor

[Antonio Vazquez]

Commit: 88d67b6c6d9ab845872bfea47eaae5f9829267bb
Author: Antonio Vazquez
Date:   Thu Mar 5 14:34:40 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB88d67b6c6d9ab845872bfea47eaae5f9829267bb

GPencil: Revert Opacity/Tint limit of 1.0 for factor

The values above 1.0 allow to force a full opacity for strokes with not enough strength

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M	source/blender/makesrna/intern/rna_gpencil_modifier.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
index 53ce7e72720..d2b07ff0ff4 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
@@ -117,6 +117,7 @@ static void deformStroke(GpencilModifierData *md,
   /* Fill using opacity factor. */
   if (mmd->modify_color != GP_MODIFY_COLOR_STROKE) {
     gps->fill_opacity_fac = mmd->factor;
+    CLAMP(gps->fill_opacity_fac, 0.0f, 1.0f);
   }
 }
 
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 88181860836..73ef4ebdf15 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -994,9 +994,9 @@ static void rna_def_modifier_gpenciltint(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Color", "Color used for tinting");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
-  prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_FACTOR);
+  prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_sdna(prop, NULL, "factor");
-  RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 2);
+  RNA_def_property_ui_range(prop, 0, 2.0, 0.1, 2);
   RNA_def_property_ui_text(prop, "Factor", "Factor for mixing color");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
@@ -1227,9 +1227,9 @@ static void rna_def_modifier_gpencilopacity(BlenderRNA *brna)
   RNA_def_property_string_funcs(prop, NULL, NULL, "rna_OpacityGpencilModifier_vgname_set");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
-  prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_FACTOR);
+  prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE);
   RNA_def_property_float_sdna(prop, NULL, "factor");
-  RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 2);
+  RNA_def_property_ui_range(prop, 0, 2.0, 0.1, 2);
   RNA_def_property_ui_text(prop, "Opacity Factor", "Factor of Opacity");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");