[Bf-blender-cvs] [bf34f95a9ed] blender2.8: UI: move 2d paint panels to topbar & toolsettings
Campbell Barton
noreply at git.blender.org
Thu Oct 25 02:18:07 CEST 2018
Commit: bf34f95a9ed1b5bafc31360459bee3ce13714371
Author: Campbell Barton
Date: Thu Oct 25 11:13:22 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBbf34f95a9ed1b5bafc31360459bee3ce13714371
UI: move 2d paint panels to topbar & toolsettings
Removed 'Tool' and 'Options' panels,
both these settings are quite obscure and
already available in the 'Brush' menu.
===================================================================
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_toolsystem_common.py
M release/scripts/startup/bl_ui/space_topbar.py
M source/blender/editors/space_buttons/space_buttons.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 67cdd9d8938..f5310645bfa 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -39,30 +39,18 @@ from bpy.app.translations import pgettext_iface as iface_
class ImagePaintPanel(UnifiedPaintPanel):
- bl_space_type = 'IMAGE_EDITOR'
- bl_region_type = 'TOOLS'
+ bl_space_type = 'PROPERTIES'
+ bl_region_type = 'WINDOW'
class BrushButtonsPanel(UnifiedPaintPanel):
- bl_space_type = 'IMAGE_EDITOR'
- bl_region_type = 'TOOLS'
+ bl_space_type = 'PROPERTIES'
+ bl_region_type = 'WINDOW'
@classmethod
def poll(cls, context):
- sima = context.space_data
toolsettings = context.tool_settings.image_paint
- return sima.show_paint and toolsettings.brush
-
-
-class UVToolsPanel:
- bl_space_type = 'IMAGE_EDITOR'
- bl_region_type = 'TOOLS'
- bl_category = "Tools"
-
- @classmethod
- def poll(cls, context):
- sima = context.space_data
- return sima.show_uvedit and not context.tool_settings.use_uv_sculpt
+ return toolsettings.brush
class IMAGE_MT_view(Menu):
@@ -846,7 +834,8 @@ class IMAGE_PT_render_slots(Panel):
class IMAGE_PT_paint(Panel, ImagePaintPanel):
- bl_label = "Paint"
+ bl_label = "Brush"
+ bl_context = ".paint_common_2d"
bl_category = "Tools"
def draw(self, context):
@@ -861,14 +850,10 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel):
if brush:
brush_texpaint_common(self, context, layout, brush, settings)
- @classmethod
- def poll(cls, context):
- sima = context.space_data
- return sima.show_paint
-
class IMAGE_PT_tools_brush_overlay(BrushButtonsPanel, Panel):
bl_label = "Overlay"
+ bl_context = ".paint_common_2d"
bl_options = {'DEFAULT_CLOSED'}
bl_category = "Options"
@@ -932,6 +917,7 @@ class IMAGE_PT_tools_brush_overlay(BrushButtonsPanel, Panel):
class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel):
bl_label = "Texture"
+ bl_context = ".paint_common_2d"
bl_options = {'DEFAULT_CLOSED'}
bl_category = "Tools"
@@ -949,6 +935,7 @@ class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel):
class IMAGE_PT_tools_mask_texture(BrushButtonsPanel, Panel):
bl_label = "Texture Mask"
+ bl_context = ".paint_common_2d"
bl_options = {'DEFAULT_CLOSED'}
bl_category = "Tools"
@@ -964,27 +951,9 @@ class IMAGE_PT_tools_mask_texture(BrushButtonsPanel, Panel):
brush_mask_texture_settings(col, brush)
-class IMAGE_PT_tools_brush_tool(BrushButtonsPanel, Panel):
- bl_label = "Tool"
- bl_options = {'DEFAULT_CLOSED'}
- bl_category = "Options"
-
- def draw(self, context):
- layout = self.layout
- toolsettings = context.tool_settings.image_paint
- brush = toolsettings.brush
-
- layout.prop(brush, "image_tool", text="")
-
- row = layout.row(align=True)
- row.prop(brush, "use_paint_sculpt", text="", icon='SCULPTMODE_HLT')
- row.prop(brush, "use_paint_vertex", text="", icon='VPAINT_HLT')
- row.prop(brush, "use_paint_weight", text="", icon='WPAINT_HLT')
- row.prop(brush, "use_paint_image", text="", icon='TPAINT_HLT')
-
-
class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel):
- bl_label = "Paint Stroke"
+ bl_label = "Stroke"
+ bl_context = ".paint_common_2d"
bl_options = {'DEFAULT_CLOSED'}
bl_category = "Tools"
@@ -1052,7 +1021,8 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel):
class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel):
- bl_label = "Paint Curve"
+ bl_label = "Curve"
+ bl_context = ".paint_common_2d"
bl_options = {'DEFAULT_CLOSED'}
bl_category = "Tools"
@@ -1076,7 +1046,7 @@ class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel):
class IMAGE_PT_tools_imagepaint_symmetry(BrushButtonsPanel, Panel):
bl_category = "Tools"
- bl_context = "imagepaint"
+ bl_context = ".imagepaint_2d"
bl_label = "Tiling"
bl_options = {'DEFAULT_CLOSED'}
@@ -1094,8 +1064,10 @@ class IMAGE_PT_tools_imagepaint_symmetry(BrushButtonsPanel, Panel):
class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel):
bl_label = "Appearance"
+ bl_context = ".paint_common_2d"
bl_options = {'DEFAULT_CLOSED'}
bl_category = "Options"
+ bl_parent_id = "IMAGE_PT_tools_brush_overlay"
def draw(self, context):
layout = self.layout
@@ -1122,26 +1094,6 @@ class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel):
sub.prop(brush, "icon_filepath", text="")
-class IMAGE_PT_tools_paint_options(BrushButtonsPanel, Panel):
- bl_label = "Image Paint"
- bl_category = "Options"
-
- def draw(self, context):
- layout = self.layout
-
- toolsettings = context.tool_settings
- # brush = toolsettings.image_paint.brush
- ups = toolsettings.unified_paint_settings
-
- col = layout.column(align=True)
- col.label(text="Unified Settings:")
-
- row = col.row()
- row.prop(ups, "use_unified_size", text="Size")
- row.prop(ups, "use_unified_strength", text="Strength")
- col.prop(ups, "use_unified_color", text="Color")
-
-
class IMAGE_PT_uv_sculpt_curve(Panel):
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@@ -1382,12 +1334,10 @@ classes = (
IMAGE_PT_tools_brush_overlay,
IMAGE_PT_tools_brush_texture,
IMAGE_PT_tools_mask_texture,
- IMAGE_PT_tools_brush_tool,
IMAGE_PT_paint_stroke,
IMAGE_PT_paint_curve,
IMAGE_PT_tools_imagepaint_symmetry,
IMAGE_PT_tools_brush_appearance,
- IMAGE_PT_tools_paint_options,
IMAGE_PT_uv_sculpt,
IMAGE_PT_uv_sculpt_curve,
IMAGE_PT_view_scopes,
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 4db2fee4bae..55fe0a3c4a5 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -532,6 +532,14 @@ class ToolSelectPanelHelper:
def draw(self, context):
self.draw_cls(self.layout, context)
+ @staticmethod
+ def tool_active_from_context(context):
+ # BAD DESIGN WARNING: last used tool
+ workspace = context.workspace
+ space_type = workspace.tools_space_type
+ mode = workspace.tools_mode
+ return ToolSelectPanelHelper._tool_active_from_context(context, space_type, mode)
+
@staticmethod
def draw_active_tool_header(
context, layout,
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index ccc96ed2ebb..db6c6037e47 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -146,7 +146,10 @@ class TOPBAR_HT_lower_bar(Header):
elif tool_mode == 'GPENCIL_WEIGHT':
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_weight", category="")
elif tool_space_type == 'IMAGE_EDITOR':
- if context.uv_sculpt_object is not None:
+ if tool_mode == 'PAINT':
+ if (tool is not None) and tool.has_datablock:
+ layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".paint_common_2d", category="")
+ elif context.uv_sculpt_object is not None:
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".uv_sculpt", category="")
def draw_center(self, context):
@@ -155,59 +158,66 @@ class TOPBAR_HT_lower_bar(Header):
def draw_right(self, context):
layout = self.layout
- # General options, note, these _could_ display at the RHS of the draw_left callback.
- # we just want them not to be confused with tool options.
- mode = context.mode
-
- if mode == 'SCULPT':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".sculpt_mode", category="")
- elif mode == 'PAINT_VERTEX':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".vertexpaint", category="")
- elif mode == 'PAINT_WEIGHT':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".weightpaint", category="")
- elif mode == 'PAINT_TEXTURE':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".imagepaint", category="")
- elif mode == 'EDIT_TEXT':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".text_edit", category="")
- elif mode == 'EDIT_ARMATURE':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".armature_edit", category="")
- elif mode == 'EDIT_METABALL':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".mball_edit", category="")
- elif mode == 'EDIT_LATTICE':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".lattice_edit", category="")
- elif mode == 'EDIT_CURVE':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".curve_edit", category="")
- elif mode == 'EDIT_MESH':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".mesh_edit", category="")
- elif mode == 'POSE':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".posemode", category="")
- elif mode == 'PARTICLE':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".particlemode", category="")
- elif mode == 'OBJECT':
- layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".objectmode", category="")
- elif mode in {'GPENCIL_PAINT', 'GPENCIL_EDIT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
- # Grease pencil layer.
- gpl = context.active_gpencil_layer
- if gpl and gpl.info is
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list