Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d.py')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py45
1 files changed, 43 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 28b66119fc6..91953c08936 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -682,7 +682,23 @@ class VIEW3D_HT_header(Header):
# Select mode for Editing
if gpd.use_stroke_edit_mode:
row = layout.row(align=True)
- row.prop(tool_settings, "gpencil_selectmode_edit", text="", expand=True)
+ row.prop_enum(tool_settings, "gpencil_selectmode_edit", text="", value='POINT')
+ row.prop_enum(tool_settings, "gpencil_selectmode_edit", text="", value='STROKE')
+
+ subrow = row.row(align=True)
+ subrow.enabled = not gpd.use_curve_edit
+ subrow.prop_enum(tool_settings, "gpencil_selectmode_edit", text="", value='SEGMENT')
+
+ # Curve edit submode
+ row = layout.row(align=True)
+ row.prop(gpd, "use_curve_edit", text="",
+ icon='IPO_BEZIER')
+ sub = row.row(align=True)
+ sub.active = gpd.use_curve_edit
+ sub.popover(
+ panel="VIEW3D_PT_gpencil_curve_edit",
+ text="Curve Editing",
+ )
# Select mode for Sculpt
if gpd.is_stroke_sculpt_mode:
@@ -708,7 +724,7 @@ class VIEW3D_HT_header(Header):
row.prop(gpd, "use_multiedit", text="", icon='GP_MULTIFRAME_EDITING')
sub = row.row(align=True)
- sub.active = gpd.use_multiedit
+ sub.enabled = gpd.use_multiedit
sub.popover(
panel="VIEW3D_PT_gpencil_multi_frame",
text="Multiframe",
@@ -6775,6 +6791,12 @@ class VIEW3D_PT_overlay_gpencil_options(Panel):
layout.prop(overlay, "vertex_opacity", text="Vertex Opacity", slider=True)
+ # Handles for Curve Edit
+ if context.object.mode == 'EDIT_GPENCIL':
+ gpd = context.object.data
+ if gpd.use_curve_edit:
+ layout.prop(overlay, "display_handle", text="Handles")
+
if context.object.mode in {'PAINT_GPENCIL', 'VERTEX_GPENCIL'}:
layout.label(text="Vertex Paint")
row = layout.row()
@@ -6938,6 +6960,24 @@ class VIEW3D_PT_gpencil_multi_frame(Panel):
layout.template_curve_mapping(settings, "multiframe_falloff_curve", brush=True)
+# Grease Pencil Object - Curve Editing tools
+class VIEW3D_PT_gpencil_curve_edit(Panel):
+ bl_space_type = 'VIEW_3D'
+ bl_region_type = 'HEADER'
+ bl_label = "Curve Editing"
+
+ def draw(self, context):
+ gpd = context.gpencil_data
+ settings = context.tool_settings.gpencil_sculpt
+
+ layout = self.layout
+ col = layout.column(align=True)
+ col.prop(gpd, "edit_curve_resolution")
+ col.prop(gpd, "curve_edit_threshold")
+ col.prop(gpd, "curve_edit_corner_angle")
+ col.prop(gpd, "use_adaptive_curve_resolution")
+
+
class VIEW3D_MT_gpencil_edit_context_menu(Menu):
bl_label = ""
@@ -7576,6 +7616,7 @@ classes = (
VIEW3D_PT_grease_pencil,
VIEW3D_PT_annotation_onion,
VIEW3D_PT_gpencil_multi_frame,
+ VIEW3D_PT_gpencil_curve_edit,
VIEW3D_PT_quad_view,
VIEW3D_PT_view3d_stereo,
VIEW3D_PT_shading,