[Bf-blender-cvs] [b09c5b8e863] greasepencil-object: GPencil: Tweaks to Vertex Panels
Antonio Vazquez
noreply at git.blender.org
Tue Nov 5 10:41:29 CET 2019
Commit: b09c5b8e86363647d57eff7220a1c1522194a53c
Author: Antonio Vazquez
Date: Tue Nov 5 10:40:36 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb09c5b8e86363647d57eff7220a1c1522194a53c
GPencil: Tweaks to Vertex Panels
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 36eb66f47ac..86d56f82fb3 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -928,15 +928,17 @@ class GreasePencilVertexcolorPanel:
ob = context.object
if ob:
- row = layout.row(align=True)
- row.prop(gpencil_paint, "use_vertex_mode", text="Mode")
-
row = layout.row(align=True)
if brush.gpencil_tool == 'DRAW':
- row = layout.row(align=True)
+ row = layout.row()
+ row.prop(gpencil_paint, "use_vertex_mode", text="Mode")
row.prop(gp_settings, "vertex_color_factor", slider=True, text="Mix Factor")
+ if brush.gpencil_tool == 'TINT':
+ row = layout.row(align=True)
+ row.prop(gpencil_paint, "use_vertex_mode", text="Mode")
+
sub_row = layout.row(align=True)
sub_row.prop(brush, "color", text="")
sub_row.prop(brush, "secondary_color", text="")
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 2706ef24fc2..63dedebf23d 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -2082,7 +2082,6 @@ class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
def draw(self, context):
layout = self.layout
- layout.use_property_split = True
layout.use_property_decorate = False
ts = context.tool_settings
settings = ts.gpencil_paint
@@ -2092,19 +2091,17 @@ class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
col = layout.column()
col.enabled = settings.use_vertex_color or brush.gpencil_tool == 'TINT'
- row = col.row(align=True)
- row.prop(settings, "use_vertex_mode", text="Mode")
-
- row = col.row(align=True)
+ if brush.gpencil_tool == 'DRAW':
+ sub_row = col.row()
+ sub_row.prop(settings, "use_vertex_mode", text="Mode")
+ sub_row.prop(gp_settings, "vertex_color_factor", slider=True, text="Mix Factor")
- if context.area.type == 'PROPERTIES':
- row.prop(brush, "color", text="")
- row = col.row(align=True)
- row.template_color_picker(brush, "color", value_slider=True)
+ if brush.gpencil_tool == 'TINT':
+ col.prop(settings, "use_vertex_mode", text="Mode")
- if brush.gpencil_tool == 'DRAW':
- row = col.row(align=True)
- row.prop(gp_settings, "vertex_color_factor", slider=True, text="Mix Factor")
+ # if context.area.type == 'PROPERTIES':
+ col.prop(brush, "color", text="")
+ col.template_color_picker(brush, "color", value_slider=True)
sub_row = col.row(align=True)
sub_row.prop(brush, "color", text="")
More information about the Bf-blender-cvs
mailing list