kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

UI: share common paint panels between all modes

Browse Source
This commit is contained in:
Campbell Barton 2018-04-30 16:59:16 +02:00
parent 7720525873
commit 3b9554ce9d
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@ -774,10 +774,10 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
_defs_vertex_paint.generate_from_brushes,
],
'PAINT_WEIGHT': [
*_tools_select,
_defs_weight_paint.generate_from_brushes,
# TODO, override brush events
_defs_weight_paint.generate_from_brushes,
*_tools_select,
(
_defs_weight_paint.gradient_linear,
_defs_weight_paint.gradient_radial,

9
release/scripts/startup/bl_ui/space_topbar.py
View File

@ -145,15 +145,16 @@ class TOPBAR_HT_lower_bar(Header):
draw_fn(context, layout)
if mode == 'SCULPT':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".dummy", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".sculpt_mode", category="")
elif mode == 'PAINT_VERTEX':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".dummy", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".vertexpaint", category="")
elif mode == 'PAINT_WEIGHT':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context="", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".weightpaint", category="")
elif mode == 'PAINT_TEXTURE':
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context="", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".imagepaint", category="")
elif mode == 'EDIT_ARMATURE':

18
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -259,7 +259,7 @@ class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel):
class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
bl_category = "Tools"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".paint_common" # dot on purpose (access from topbar)
bl_label = "Brush"
@classmethod
@ -634,7 +634,7 @@ class VIEW3D_PT_stencil_projectpaint(View3DPanel, Panel):
class VIEW3D_PT_tools_brush_overlay(Panel, View3DPaintPanel):
bl_category = "Options"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".paint_common" # dot on purpose (access from topbar)
bl_label = "Overlay"
@classmethod
@ -701,7 +701,7 @@ class VIEW3D_PT_tools_brush_overlay(Panel, View3DPaintPanel):
class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel):
bl_category = "Tools"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".paint_common" # dot on purpose (access from topbar)
bl_label = "Texture"
bl_options = {'DEFAULT_CLOSED'}
@ -749,7 +749,7 @@ class VIEW3D_PT_tools_mask_texture(Panel, View3DPaintPanel):
class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel):
bl_category = "Tools"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".paint_common" # dot on purpose (access from topbar)
bl_label = "Stroke"
bl_options = {'DEFAULT_CLOSED'}
@ -848,7 +848,7 @@ class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel):
class VIEW3D_PT_tools_brush_curve(Panel, View3DPaintPanel):
bl_category = "Tools"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".paint_common" # dot on purpose (access from topbar)
bl_label = "Curve"
bl_options = {'DEFAULT_CLOSED'}
@ -878,7 +878,7 @@ class VIEW3D_PT_tools_brush_curve(Panel, View3DPaintPanel):
class VIEW3D_PT_sculpt_dyntopo(Panel, View3DPaintPanel):
bl_category = "Tools"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
bl_label = "Dyntopo"
bl_options = {'DEFAULT_CLOSED'}
@ -929,7 +929,7 @@ class VIEW3D_PT_sculpt_dyntopo(Panel, View3DPaintPanel):
class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
bl_category = "Options"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
bl_label = "Options"
bl_options = {'DEFAULT_CLOSED'}
@ -963,7 +963,7 @@ class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel):
bl_category = "Tools"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
bl_label = "Symmetry/Lock"
bl_options = {'DEFAULT_CLOSED'}
@ -1005,7 +1005,7 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel):
class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel):
bl_category = "Options"
bl_context = ".dummy" # dot on purpose (access from topbar)
bl_context = ".paint_common" # dot on purpose (access from topbar)
bl_label = "Appearance"
@classmethod