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

GPencil: Fix unreported Threshold parameter visible in wrong context

Browse Source 
The threshold only must be vsisible in Segment mode.
This commit is contained in:
Antonio Vazquez 2020-03-25 17:34:11 +01:00
parent acd84ab105
commit 6681a33a6f
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1472,6 +1472,17 @@ class _defs_gpencil_paint:
class _defs_gpencil_edit:
def is_segment(context):
ts = context.scene.tool_settings
if context.mode == 'EDIT_GPENCIL':
return ts.gpencil_selectmode_edit == 'SEGMENT'
elif context.mode == 'SCULPT_GPENCIL':
return ts.use_gpencil_select_mask_segment
elif context.mode == 'VERTEX_GPENCIL':
return ts.use_gpencil_vertex_select_mask_segment
else:
return False
@ToolDef.from_fn
def bend():
return dict(
@ -1485,7 +1496,8 @@ class _defs_gpencil_edit:
@ToolDef.from_fn
def select():
def draw_settings(context, layout, _tool):
layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
if _defs_gpencil_edit.is_segment(context):
layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
return dict(
idname="builtin.select",
label="Tweak",
@ -1502,7 +1514,8 @@ class _defs_gpencil_edit:
row = layout.row()
row.use_property_split = False
row.prop(props, "mode", text="", expand=True, icon_only=True)
layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
if _defs_gpencil_edit.is_segment(context):
layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
return dict(
idname="builtin.select_box",
label="Select Box",
@ -1519,7 +1532,8 @@ class _defs_gpencil_edit:
row = layout.row()
row.use_property_split = False
row.prop(props, "mode", text="", expand=True, icon_only=True)
layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
if _defs_gpencil_edit.is_segment(context):
layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
return dict(
idname="builtin.select_lasso",
label="Select Lasso",
@ -1537,7 +1551,8 @@ class _defs_gpencil_edit:
row.use_property_split = False
row.prop(props, "mode", text="", expand=True, icon_only=True)
layout.prop(props, "radius")
layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
if _defs_gpencil_edit.is_segment(context):
layout.prop(context.tool_settings.gpencil_sculpt, "intersection_threshold")
def draw_cursor(_context, tool, xy):
from gpu_extras.presets import draw_circle_2d