diff options
| author | Antonioya <blendergit@gmail.com> | 2019-08-17 17:18:09 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2019-08-17 17:26:46 +0300 |
| commit | 85f90ed6fd8858a60ea24dd82f73b88363207133 (patch) | |
| tree | 51f3d1442e50505ab00c0f41ac71a7d971eb37a6 /release | |
| parent | 0e1d4dec7a7d50867c97179299775d31ac30938e (diff) | |
Fix T68723: GPencil - Split Select mode for Sculpt and Edit mode
Actually, the selection mode is not visible in Sculpt mode when mask is enabled, but still is used.
Also, the mode is shared between Edit mode and Sculpt mode and for meshes the selector is by mode.
This commit splits the select mode in different properties and show the selector in Sculpt mode to define the Select mode. Also, the Select Mask button has been removed and now the Select Mode buttons work equal to Meshes where the select buttons are the mask enable too.
Fixed some old code not valid detected during these changes.
Differential Revision: https://developer.blender.org/D5500
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_toolsystem_toolbar.py | 5 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 17e753d531f..fabf8abaeab 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1508,8 +1508,9 @@ class _defs_gpencil_sculpt: return True ob = context.active_object ts = context.scene.tool_settings - return (ob and ob.type == 'GPENCIL' and - (ts.gpencil_sculpt.use_select_mask)) + return ob and ob.type == 'GPENCIL' and (ts.use_gpencil_select_mask_point or + ts.use_gpencil_select_mask_stroke or + ts.use_gpencil_select_mask_segment) @staticmethod def generate_from_brushes(context): diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 80865b8f86d..8bb211052da 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -599,17 +599,20 @@ class VIEW3D_HT_header(Header): sub.separator(factor=0.4) sub.prop(tool_settings, "use_gpencil_draw_additive", text="", icon='FREEZE') + # Select mode for Editing if gpd.use_stroke_edit_mode: row = layout.row(align=True) - row.prop(tool_settings, "gpencil_selectmode", text="", expand=True) + row.prop(tool_settings, "gpencil_selectmode_edit", text="", expand=True) - if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode: + # Select mode for Sculpt + if gpd.is_stroke_sculpt_mode : row = layout.row(align=True) + row.prop(tool_settings, "use_gpencil_select_mask_point", text="") + row.prop(tool_settings, "use_gpencil_select_mask_stroke", text="") + row.prop(tool_settings, "use_gpencil_select_mask_segment", text="") - if gpd.is_stroke_sculpt_mode: - row.prop(tool_settings.gpencil_sculpt, "use_select_mask", text="") - row.separator() - + if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode: + row = layout.row(align=True) row.prop(gpd, "use_multiedit", text="", icon='GP_MULTIFRAME_EDITING') sub = row.row(align=True) @@ -621,8 +624,6 @@ class VIEW3D_HT_header(Header): if gpd.use_stroke_edit_mode: row = layout.row(align=True) - row.prop(tool_settings.gpencil_sculpt, "use_select_mask", text="") - row.popover( panel="VIEW3D_PT_tools_grease_pencil_interpolate", text="Interpolate", @@ -732,7 +733,10 @@ class VIEW3D_MT_editor_menus(Menu): # Select Menu if gp_edit: if mode_string not in {'PAINT_GPENCIL', 'WEIGHT_GPENCIL'}: - if mode_string == 'SCULPT_GPENCIL' and ts.gpencil_sculpt.use_select_mask: + if mode_string == 'SCULPT_GPENCIL' and \ + (ts.use_gpencil_select_mask_point or + ts.use_gpencil_select_mask_stroke or + ts.use_gpencil_select_mask_segment): layout.menu("VIEW3D_MT_select_gpencil") elif mode_string == 'EDIT_GPENCIL': layout.menu("VIEW3D_MT_select_gpencil") |