Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-03-12 22:29:04 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-03-12 22:29:04 +0300
commit2050baa139006760fc43ea94cbfb1290698575f5 (patch)
tree8c09966ef6746099bdd98106710d4d134657ab71 /release
parentc1290a1d1f6beee8e60990d888fdb0a4d1a34e17 (diff)
GPencil: Move Vertex Paint mode to topbar
It's more easy to find in the topbar
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_grease_pencil_common.py4
-rw-r--r--release/scripts/startup/bl_ui/properties_paint_common.py10
2 files changed, 9 insertions, 5 deletions
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 fced848641e..7c79349a245 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -692,10 +692,6 @@ class GreasePencilVertexcolorPanel:
row = layout.row(align=True)
row.prop(gp_settings, "vertex_color_factor", slider=True, text="Mix Factor")
- if tool == 'TINT' or is_vertex is True:
- row = layout.row(align=True)
- row.prop(gp_settings, "vertex_mode", text="Mode")
-
class GPENCIL_UL_layer(UIList):
def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index b50791050c4..34afcc09407 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -1065,13 +1065,16 @@ def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False)
row = layout.row(align=True)
row.prop(gp_settings, "fill_simplify_level", text="Simplify")
- else: # brush.gpencil_tool == 'DRAW':
+ else: # brush.gpencil_tool == 'DRAW/TINT':
row = layout.row(align=True)
row.prop(brush, "size", text="Radius")
row.prop(gp_settings, "use_pressure", text="", icon='STYLUS_PRESSURE')
row = layout.row(align=True)
row.prop(gp_settings, "pen_strength", slider=True)
row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
+ if brush.gpencil_tool == 'TINT':
+ row = layout.row(align=True)
+ row.prop(gp_settings, "vertex_mode", text="Mode")
# FIXME: tools must use their own UI drawing!
if tool.idname in {
@@ -1159,6 +1162,11 @@ def brush_basic_gpencil_vertex_settings(layout, _context, brush, *, compact=Fals
row.prop(gp_settings, "pen_strength", slider=True)
row.prop(gp_settings, "use_strength_pressure", text="", icon='STYLUS_PRESSURE')
+ if brush.gpencil_vertex_tool in {'DRAW', 'REPLACE'}:
+ row = layout.row(align=True)
+ row.prop(gp_settings, "vertex_mode", text="Mode")
+
+
classes = (
VIEW3D_MT_tools_projectpaint_clone,
)