[Bf-blender-cvs] [33c0861db89] greasepencil-object: GPencil: Modifier: Fix UI of Tint and Opacity modifiers

[Clément Foucault]

Commit: 33c0861db89b2c0d67df6ae99d91ab64bca2562b
Author: Clément Foucault
Date:   Wed Mar 4 19:21:55 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB33c0861db89b2c0d67df6ae99d91ab64bca2562b

GPencil: Modifier: Fix UI of Tint and Opacity modifiers

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

M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	source/blender/makesrna/intern/rna_gpencil_modifier.c

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

diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index ce8fac0c40a..27eb195c487 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1950,16 +1950,9 @@ class DATA_PT_gpencil_modifiers(ModifierButtonsPanel, Panel):
 
         col = split.column()
         col.prop(md, "factor")
-        col.prop(md, "modify_color", text="Change")
+        col.prop(md, "modify_color")
 
-        col = layout.column()
-        col.separator()
-        col.label(text="Vertex Group:")
-        row = col.row(align=True)
-        row.prop_search(md, "vertex_group", ob, "vertex_groups", text="")
-        row.prop(md, "invert_vertex", text="", icon='ARROW_LEFTRIGHT')
-
-        self.gpencil_masking(layout, ob, md, False)
+        self.gpencil_masking(layout, ob, md, True)
 
     def GP_ARRAY(self, layout, ob, md):
         col = layout.column()
diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c
index 161367b2335..6101f0eece8 100644
--- a/source/blender/makesrna/intern/rna_gpencil_modifier.c
+++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c
@@ -985,7 +985,7 @@ static void rna_def_modifier_gpenciltint(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_sdna(prop, NULL, "factor");
-  RNA_def_property_ui_range(prop, 0, 2.0, 0.1, 2);
+  RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 2);
   RNA_def_property_ui_text(prop, "Factor", "Factor for mixing color");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");
 
@@ -1215,7 +1215,7 @@ static void rna_def_modifier_gpencilopacity(BlenderRNA *brna)
 
   prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_FACTOR);
   RNA_def_property_float_sdna(prop, NULL, "factor");
-  RNA_def_property_ui_range(prop, 0, 2.0, 0.1, 2);
+  RNA_def_property_ui_range(prop, 0.0, 1.0, 0.1, 2);
   RNA_def_property_ui_text(prop, "Opacity Factor", "Factor of Opacity");
   RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");