[Bf-blender-cvs] [7fb06264cc4] greasepencil-object: GPencil: Use expanded enum for Random Curve tab selector

[Antonio Vazquez]

Commit: 7fb06264cc4a79782363987a871ae5eff531cd0b
Author: Antonio Vazquez
Date:   Wed Apr 22 11:54:00 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7fb06264cc4a79782363987a871ae5eff531cd0b

GPencil: Use expanded enum for Random Curve tab selector

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

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/makesrna/intern/rna_brush.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 154613f8c71..0e8d5d3c477 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1741,13 +1741,11 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_random(View3DPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
-        layout.use_property_split = True
-
         brush = context.tool_settings.gpencil_paint.brush
         gp_settings = brush.gpencil_settings
 
         row=layout.row(align=True)
-        row.prop(gp_settings, "curve_random_tab", expand=True)
+        row.prop(gp_settings, "curve_random_tab")
 
         if gp_settings.curve_random_tab == 'PRESSURE':
             curve = "curve_random_pressure"
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 4b25e849834..5cc8c4402eb 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -284,12 +284,12 @@ static EnumPropertyItem rna_enum_gpencil_brush_vertex_icons_items[] = {
 };
 
 static EnumPropertyItem rna_enum_brush_curvetab_types_items[] = {
-    {GP_BRUSH_CURVETAB_PRESSURE, "PRESSURE", 0, "PS", "Pressure"},
-    {GP_BRUSH_CURVETAB_STRENGTH, "STRENGTH", 0, "ST", "Strength"},
+    {GP_BRUSH_CURVETAB_PRESSURE, "PRESSURE", 0, "Pressure", "Pressure"},
+    {GP_BRUSH_CURVETAB_STRENGTH, "STRENGTH", 0, "Strength", "Strength"},
     {GP_BRUSH_CURVETAB_UV, "UV", 0, "UV", "UV"},
-    {GP_BRUSH_CURVETAB_HUE, "HUE", 0, "H", "Hue"},
-    {GP_BRUSH_CURVETAB_SATURATION, "SATURATION", 0, "S", "Saturation"},
-    {GP_BRUSH_CURVETAB_VALUE, "VALUE", 0, "V", "Value"},
+    {GP_BRUSH_CURVETAB_HUE, "HUE", 0, "Hue", "Hue"},
+    {GP_BRUSH_CURVETAB_SATURATION, "SATURATION", 0, "Saturation", "Saturation"},
+    {GP_BRUSH_CURVETAB_VALUE, "VALUE", 0, "Value", "Value"},
     {0, NULL, 0, NULL, NULL},
 };