[Bf-blender-cvs] [ddadfff17d5] greasepencil-object: GPencil: Move curves below each property
Antonio Vazquez
noreply at git.blender.org
Wed Apr 22 16:31:31 CEST 2020
Commit: ddadfff17d594516abc8ea9a3c7097e8a06f07f8
Author: Antonio Vazquez
Date: Wed Apr 22 16:31:25 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rBddadfff17d594516abc8ea9a3c7097e8a06f07f8
GPencil: Move curves below each property
===================================================================
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/makesdna/DNA_brush_types.h
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 fbd30af6e54..ed753b85742 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1603,7 +1603,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
def draw(self, context):
layout = self.layout
- layout.use_property_split = True
+ layout.use_property_split = False
layout.use_property_decorate = False
tool_settings = context.tool_settings
@@ -1623,16 +1623,25 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
row.prop(gp_settings, "random_pressure", text="Pressure", slider=True)
row.prop(gp_settings, "use_stroke_random_pressure", text="", icon='GP_SELECT_STROKES')
row.prop(gp_settings, "use_random_press_pressure", text="", icon='STYLUS_PRESSURE')
+ if gp_settings.use_random_press_pressure:
+ col.template_curve_mapping(gp_settings, "curve_random_pressure", brush=True,
+ use_negative_slope=True)
row = col.row(align=True)
row.prop(gp_settings, "random_strength", text="Strength", slider=True)
row.prop(gp_settings, "use_stroke_random_strength", text="", icon='GP_SELECT_STROKES')
row.prop(gp_settings, "use_random_press_strength", text="", icon='STYLUS_PRESSURE')
+ if gp_settings.use_random_press_strength:
+ col.template_curve_mapping(gp_settings, "curve_random_strength", brush=True,
+ use_negative_slope=True)
row = col.row(align=True)
row.prop(gp_settings, "uv_random", text="UV", slider=True)
row.prop(gp_settings, "use_stroke_random_uv", text="", icon='GP_SELECT_STROKES')
row.prop(gp_settings, "use_random_press_uv", text="", icon='STYLUS_PRESSURE')
+ if gp_settings.use_random_press_uv:
+ col.template_curve_mapping(gp_settings, "curve_random_uv", brush=True,
+ use_negative_slope=True)
col.separator()
@@ -1642,22 +1651,34 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
row.prop(gp_settings, "random_hue_factor", slider=True)
row.prop(gp_settings, "use_stroke_random_hue", text="", icon='GP_SELECT_STROKES')
row.prop(gp_settings, "use_random_press_hue", text="", icon='STYLUS_PRESSURE')
+ if gp_settings.use_random_press_hue:
+ col1.template_curve_mapping(gp_settings, "curve_random_hue", brush=True,
+ use_negative_slope=True)
row = col1.row(align=True)
row.prop(gp_settings, "random_saturation_factor", slider=True)
row.prop(gp_settings, "use_stroke_random_sat", text="", icon='GP_SELECT_STROKES')
row.prop(gp_settings, "use_random_press_sat", text="", icon='STYLUS_PRESSURE')
+ if gp_settings.use_random_press_sat:
+ col1.template_curve_mapping(gp_settings, "curve_random_saturation", brush=True,
+ use_negative_slope=True)
row = col1.row(align=True)
row.prop(gp_settings, "random_value_factor", slider=True)
row.prop(gp_settings, "use_stroke_random_val", text="", icon='GP_SELECT_STROKES')
row.prop(gp_settings, "use_random_press_val", text="", icon='STYLUS_PRESSURE')
+ if gp_settings.use_random_press_val:
+ col1.template_curve_mapping(gp_settings, "curve_random_value", brush=True,
+ use_negative_slope=True)
col.separator()
row = col.row(align=True)
row.prop(gp_settings, "pen_jitter", slider=True)
row.prop(gp_settings, "use_jitter_pressure", text="", icon='STYLUS_PRESSURE')
+ if gp_settings.use_jitter_pressure:
+ col.template_curve_mapping(gp_settings, "curve_jitter", brush=True,
+ use_negative_slope=True)
# Grease Pencil drawingcurves
@@ -1711,61 +1732,6 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_strength(View3DPanel, Panel):
use_negative_slope=True)
-class VIEW3D_PT_tools_grease_pencil_brushcurves_jitter(View3DPanel, Panel):
- bl_context = ".greasepencil_paint"
- bl_label = "Jitter"
- bl_category = "Tool"
- bl_parent_id = "VIEW3D_PT_tools_grease_pencil_brushcurves"
-
- def draw(self, context):
- layout = self.layout
- layout.use_property_split = True
-
- brush = context.tool_settings.gpencil_paint.brush
- gp_settings = brush.gpencil_settings
-
- layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True,
- use_negative_slope=True)
-
-
-class VIEW3D_PT_tools_grease_pencil_brushcurves_random(View3DPanel, Panel):
- bl_context = ".greasepencil_paint"
- bl_label = "Random"
- bl_category = "Tool"
- bl_parent_id = "VIEW3D_PT_tools_grease_pencil_brushcurves"
- bl_options = {'DEFAULT_CLOSED'}
-
- @classmethod
- def poll(cls, context):
- return (context.region.type != 'TOOL_HEADER')
-
- def draw(self, context):
- layout = self.layout
- brush = context.tool_settings.gpencil_paint.brush
- gp_settings = brush.gpencil_settings
-
- row = layout.row(align=True)
- row.prop(gp_settings, "curve_random_tab")
-
- if gp_settings.curve_random_tab == 'PRESSURE':
- curve = "curve_random_pressure"
- elif gp_settings.curve_random_tab == 'STRENGTH':
- curve = "curve_random_strength"
- elif gp_settings.curve_random_tab == 'UV':
- curve = "curve_random_uv"
- elif gp_settings.curve_random_tab == 'HUE':
- curve = "curve_random_hue"
- elif gp_settings.curve_random_tab == 'SATURATION':
- curve = "curve_random_saturation"
- elif gp_settings.curve_random_tab == 'VALUE':
- curve = "curve_random_value"
- else:
- curve = "curve_random_strength"
-
- layout.template_curve_mapping(gp_settings, curve, brush=True,
- use_negative_slope=True)
-
-
class VIEW3D_PT_tools_grease_pencil_brush_paint_falloff(GreasePencilBrushFalloff, Panel, View3DPaintPanel):
bl_context = ".greasepencil_paint"
bl_label = "Falloff"
@@ -2344,8 +2310,6 @@ classes = (
VIEW3D_PT_tools_grease_pencil_brushcurves,
VIEW3D_PT_tools_grease_pencil_brushcurves_sensitivity,
VIEW3D_PT_tools_grease_pencil_brushcurves_strength,
- VIEW3D_PT_tools_grease_pencil_brushcurves_jitter,
- VIEW3D_PT_tools_grease_pencil_brushcurves_random,
VIEW3D_PT_tools_grease_pencil_paint_appearance,
VIEW3D_PT_tools_grease_pencil_sculpt_select,
VIEW3D_PT_tools_grease_pencil_sculpt_settings,
diff --git a/source/blender/makesdna/DNA_brush_types.h b/source/blender/makesdna/DNA_brush_types.h
index c967ecadf2f..5c5cd3a905b 100644
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@ -118,8 +118,7 @@ typedef struct BrushGpencilSettings {
int sculpt_mode_flag;
/** Preset type (used to reset brushes - internal). */
short preset_type;
- /** Curve type active tab for random curves. */
- short curve_random_tab;
+ char _pad3[2];
/** Randomness for Hue. */
float random_hue;
@@ -186,17 +185,6 @@ typedef enum eGPBrush_Presets {
GP_BRUSH_PRESET_DRAW_WEIGHT = 300,
} eGPBrush_Presets;
-/* BrushGpencilSettings->curve_tab_type */
-
-typedef enum eGPBrush_TabType {
- GP_BRUSH_CURVETAB_PRESSURE = 0,
- GP_BRUSH_CURVETAB_STRENGTH = 1,
- GP_BRUSH_CURVETAB_UV = 2,
- GP_BRUSH_CURVETAB_HUE = 3,
- GP_BRUSH_CURVETAB_SATURATION = 4,
- GP_BRUSH_CURVETAB_VALUE = 5,
-} eGPBrush_TabType;
-
/* BrushGpencilSettings->gp_flag */
typedef enum eGPDbrush_Flag {
/* brush use pressure */
diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c
index 5cc8c4402eb..8d83d2a9134 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -282,17 +282,6 @@ static EnumPropertyItem rna_enum_gpencil_brush_vertex_icons_items[] = {
{GP_BRUSH_ICON_VERTEX_REPLACE, "REPLACE", ICON_BRUSH_MIX, "Replace", ""},
{0, NULL, 0, NULL, NULL},
};
-
-static EnumPropertyItem rna_enum_brush_curvetab_types_items[] = {
- {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, "Hue", "Hue"},
- {GP_BRUSH_CURVETAB_SATURATION, "SATURATION", 0, "Saturation", "Saturation"},
- {GP_BRUSH_CURVETAB_VALUE, "VALUE", 0, "Value", "Value"},
- {0, NULL, 0, NULL, NULL},
-};
-
#endif
#ifdef RNA_RUNTIME
@@ -1307,13 +1296,6 @@ static void rna_def_gpencil_options(BlenderRNA *brna)
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);
- prop = RNA_def_property(srna, "curve_random_tab", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_sdna(prop, NULL, "curve_random_tab");
- RNA_def_property_enum_items(prop, rna_enum_brush_curvetab_types_items);
- RNA_def_property_ui_text(prop, "Curve", "Curve Tab");
- RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
- RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, NULL);
-
prop = RNA_def_property(srna, "curve_random_pressure", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "curve_rand_pressure");
RNA_def_property_struct_type(prop, "CurveMapping");
More information about the Bf-blender-cvs
mailing list