[Bf-blender-cvs] [928becec60d] master: UV Sculpt: improve tool-system integration
Campbell Barton
noreply at git.blender.org
Wed May 1 13:45:34 CEST 2019
Commit: 928becec60d16880838dd756cc8b6b5ee73f9b2d
Author: Campbell Barton
Date: Wed May 1 18:10:34 2019 +1000
Branches: master
https://developer.blender.org/rB928becec60d16880838dd756cc8b6b5ee73f9b2d
UV Sculpt: improve tool-system integration
In 2.7x UV sculpt was a kind of sub-mode
(a toggle with it's own key-map & drawing code).
Move this to an operator that uses the tool-system,
this simplifies internal logic, especially brush selection
which now matches sculpt and other paint modes.
- Remove toggle used to enable uv sculpt.
- Expose the brush, which was already used but there was no way to
select different brushes.
- Make UV sculpt use paint paint tool slots
(using brushes how all other paint mode currently do).
- Move UV Sculpt keymap to the tools keymap.
- Remove Q to toggle UV sculpt mode,
S/P/G keys to switch tools.
===================================================================
M doc/python_api/sphinx_doc_gen.py
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/intern/paint.c
M source/blender/blenkernel/intern/paint_toolslots.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/editors/include/ED_image.h
M source/blender/editors/include/ED_uvedit.h
M source/blender/editors/object/object_edit.c
M source/blender/editors/screen/screen_context.c
M source/blender/editors/sculpt_paint/paint_intern.h
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/sculpt_paint/sculpt_uv.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/RNA_enum_types.h
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/windowmanager/intern/wm_keymap_utils.c
M source/blender/windowmanager/intern/wm_toolsystem.c
===================================================================
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 0d34392ff32..f8b3f0c962d 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1054,7 +1054,6 @@ context_type_map = {
"texture_slot": ("MaterialTextureSlot", False),
"texture_user": ("ID", False),
"texture_user_property": ("Property", False),
- "uv_sculpt_object": ("Object", False),
"vertex_paint_object": ("Object", False),
"view_layer": ("ViewLayer", False),
"visible_bases": ("ObjectBase", True),
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 9a4ad19556a..844e5d335e6 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -863,8 +863,6 @@ def km_uv_editor(params):
("uv.minimize_stretch", {"type": 'V', "value": 'PRESS', "ctrl": True}, None),
("uv.pack_islands", {"type": 'P', "value": 'PRESS', "ctrl": True}, None),
("uv.average_islands_scale", {"type": 'A', "value": 'PRESS', "ctrl": True}, None),
- ("wm.context_toggle", {"type": 'Q', "value": 'PRESS'},
- {"properties": [("data_path", 'tool_settings.use_uv_sculpt')]}),
])
if params.select_mouse == 'LEFTMOUSE' and not params.legacy:
@@ -877,39 +875,6 @@ def km_uv_editor(params):
return keymap
-def km_uv_sculpt(_params):
- items = []
- keymap = (
- "UV Sculpt",
- {"space_type": 'EMPTY', "region_type": 'WINDOW'},
- {"items": items},
- )
-
- items.extend([
- ("wm.context_toggle", {"type": 'Q', "value": 'PRESS'},
- {"properties": [("data_path", 'tool_settings.use_uv_sculpt')]}),
- ("sculpt.uv_sculpt_stroke", {"type": 'LEFTMOUSE', "value": 'PRESS'},
- {"properties": [("mode", 'NORMAL')]}),
- ("sculpt.uv_sculpt_stroke", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
- {"properties": [("mode", 'INVERT')]}),
- ("sculpt.uv_sculpt_stroke", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
- {"properties": [("mode", 'RELAX')]}),
- ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
- {"properties": [("scalar", 0.9)]}),
- ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
- {"properties": [("scalar", 1.0 / 0.9)]}),
- *_template_paint_radial_control("uv_sculpt"),
- ("brush.uv_sculpt_tool_set", {"type": 'S', "value": 'PRESS'},
- {"properties": [("tool", 'RELAX')]}),
- ("brush.uv_sculpt_tool_set", {"type": 'P', "value": 'PRESS'},
- {"properties": [("tool", 'PINCH')]}),
- ("brush.uv_sculpt_tool_set", {"type": 'G', "value": 'PRESS'},
- {"properties": [("tool", 'GRAB')]}),
- ])
-
- return keymap
-
-
# 3D View: all regions.
def km_view3d_generic(_params):
items = []
@@ -5277,6 +5242,25 @@ def km_image_editor_tool_uv_select_lasso(params):
)
+def km_image_editor_tool_uv_sculpt_stroke(params):
+ return (
+ "Image Editor Tool: Uv, Sculpt Stroke",
+ {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'},
+ {"items": [
+ ("sculpt.uv_sculpt_stroke", {"type": params.tool_mouse, "value": 'PRESS'}, None),
+ ("sculpt.uv_sculpt_stroke", {"type": params.tool_mouse, "value": 'PRESS', "ctrl": True},
+ {"properties": [("mode", 'INVERT')]}),
+ ("sculpt.uv_sculpt_stroke", {"type": params.tool_mouse, "value": 'PRESS', "shift": True},
+ {"properties": [("mode", 'RELAX')]}),
+ ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
+ {"properties": [("scalar", 0.9)]}),
+ ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
+ {"properties": [("scalar", 1.0 / 0.9)]}),
+ *_template_paint_radial_control("uv_sculpt"),
+ ]},
+ )
+
+
def km_node_editor_tool_select(params):
return (
"Node Tool: Select",
@@ -6117,7 +6101,6 @@ def generate_keymaps(params=None):
# Editors.
km_outliner(params),
km_uv_editor(params),
- km_uv_sculpt(params),
km_view3d_generic(params),
km_view3d(params),
km_mask_editing(params),
@@ -6245,6 +6228,7 @@ def generate_keymaps(params=None):
km_image_editor_tool_uv_select_box(params),
km_image_editor_tool_uv_select_circle(params),
km_image_editor_tool_uv_select_lasso(params),
+ km_image_editor_tool_uv_sculpt_stroke(params),
km_node_editor_tool_select(params),
km_node_editor_tool_select_box(params),
km_node_editor_tool_select_lasso(params),
diff --git a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
index 0ea229ad12e..2e67c631efc 100644
--- a/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
+++ b/release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
@@ -546,38 +546,6 @@ def km_uv_editor(params):
return keymap
-def km_uv_sculpt(params):
- items = []
- keymap = (
- "UV Sculpt",
- {"space_type": 'EMPTY', "region_type": 'WINDOW'},
- {"items": items},
- )
-
- items.extend([
- ("wm.context_toggle", {"type": 'Q', "value": 'PRESS'},
- {"properties": [("data_path", 'tool_settings.use_uv_sculpt')]}),
- ("sculpt.uv_sculpt_stroke", {"type": 'LEFTMOUSE', "value": 'PRESS'},
- {"properties": [("mode", 'NORMAL')]}),
- ("sculpt.uv_sculpt_stroke", {"type": 'LEFTMOUSE', "value": 'PRESS', "ctrl": True},
- {"properties": [("mode", 'INVERT')]}),
- ("sculpt.uv_sculpt_stroke", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True},
- {"properties": [("mode", 'RELAX')]}),
- ("brush.scale_size", {"type": 'LEFT_BRACKET', "value": 'PRESS'},
- {"properties": [("scalar", 0.9)]}),
- ("brush.scale_size", {"type": 'RIGHT_BRACKET', "value": 'PRESS'},
- {"properties": [("scalar", 1.0 / 0.9)]}),
- *_template_paint_radial_control("uv_sculpt"),
- ("brush.uv_sculpt_tool_set", {"type": 'S', "value": 'PRESS'},
- {"properties": [("tool", 'RELAX')]}),
- ("brush.uv_sculpt_tool_set", {"type": 'P', "value": 'PRESS'},
- {"properties": [("tool", 'PINCH')]}),
- ("brush.uv_sculpt_tool_set", {"type": 'G', "value": 'PRESS'},
- {"properties": [("tool", 'GRAB')]}),
- ])
-
- return keymap
-
# 3D View: all regions.
def km_view3d_generic(_params):
items = []
@@ -3582,7 +3550,6 @@ def generate_keymaps(params=None):
# Editors.
km_outliner(params),
km_uv_editor(params),
- km_uv_sculpt(params),
km_view3d_generic(params),
km_view3d(params),
km_mask_editing(params),
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 466ba40b688..b27895fa04b 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -364,10 +364,6 @@ class IMAGE_MT_uvs(Menu):
layout.separator()
- layout.prop(tool_settings, "use_uv_sculpt")
-
- layout.separator()
-
layout.prop(uv, "use_live_unwrap")
layout.operator("uv.unwrap")
@@ -555,8 +551,9 @@ class IMAGE_HT_tool_header(Header):
if tool_mode == 'PAINT':
if (tool is not None) and tool.has_datablock:
layout.popover_group(space_type='IMAGE_EDITOR', region_type='UI', context=".paint_common_2d", category="")
- elif context.uv_sculpt_object is not None:
- layout.popover_group(space_type='IMAGE_EDITOR', region_type='UI', context=".uv_sculpt", category="")
+ elif tool_mode == 'UV':
+ if (tool is not None) and tool.has_datablock:
+ layout.popover_group(space_type='IMAGE_EDITOR', region_type='UI', context=".uv_sculpt", category="")
def draw_mode_settings(self, context):
layout = self.layout
@@ -573,10 +570,10 @@ class IMAGE_HT_tool_header(Header):
class _draw_tool_settings_context_mode:
@staticmethod
- def VIEW(context, layout, _tool):
- tool_settings = context.tool_settings
- if tool_settings.use_uv_sculpt:
+ def UV(context, layout, tool):
+ if tool and tool.has_datablock:
if context.mode == 'EDIT_MESH':
+ tool_settings = context.tool_settings
uv_sculpt = tool_settings.uv_sculpt
brush = uv_sculpt.brush
if brush:
@@ -1378,54 +1375,33 @@ class IMAGE_PT_tools_imagepaint_symmetry(BrushButtonsPanel, Panel):
row.prop(ipaint, "tile_y", text="Y", toggle=True)
-class IMAGE_PT_uv_sculpt_curve(Panel):
+class IMAGE_PT_uv_sculpt_brush(Panel):
bl_space_type = 'IMAGE_EDITOR'
bl_region_type = 'UI'
bl_context = ".uv_sculpt" # dot on purpose (access from topbar)
bl_category = "Tool"
- bl_label = "UV Sculpt Curve"
- bl_options = {'DEFAULT_CLOSED'}
+ bl_label = "Brush"
@classmethod
def poll(cls, context):
- return (context.uv_sculpt_object is not None)
+ sima = context.space_data
+ # TODO(campbell): nicer way to check if we're in uv sculpt mode.
+ if sima and sima.show_uvedit:
+ from .space_toolsystem_common import ToolSelectPanelHelper
+ tool = ToolSelectPanelHelper.tool_active_from_context(context)
+ if tool.has_datablock:
+ return True
+ return False
def draw(self, context):
+ from .properties_paint_common import UnifiedPaintPanel
layout = self.layout
tool_settings = context.tool_settings
uvsculpt = tool_settings.uv_sculpt
- brush = uvsculpt.brush
-
- if brush is not None:
- layout.template_curve_mapping(brush, "curve")
- row = layout.row(align=True)
- row.operator("brush.curve_preset", icon='SMOOTHCURVE', text="").shape = 'SMOO
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list