[Bf-blender-cvs] [afb6bd16a1b] temp-gpencil-bezier-v2: GPencil: Remove curve edit mode toggle

Falk David noreply at git.blender.org
Thu Jan 21 13:26:37 CET 2021


Commit: afb6bd16a1b1ec4ce094f7c293e56ef30417b73c
Author: Falk David
Date:   Thu Jan 21 11:52:30 2021 +0100
Branches: temp-gpencil-bezier-v2
https://developer.blender.org/rBafb6bd16a1b1ec4ce094f7c293e56ef30417b73c

GPencil: Remove curve edit mode toggle

This just removes the toggle from the UI

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 28d0b59590a..22d28810577 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -665,21 +665,8 @@ class VIEW3D_HT_header(Header):
                 row = layout.row(align=True)
                 row.prop_enum(tool_settings, "gpencil_selectmode_edit", text="", value='POINT')
                 row.prop_enum(tool_settings, "gpencil_selectmode_edit", text="", value='STROKE')
+                row.prop_enum(tool_settings, "gpencil_selectmode_edit", text="", value='SEGMENT')
 
-                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:
@@ -6825,8 +6812,7 @@ class VIEW3D_PT_overlay_gpencil_options(Panel):
             # 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")
+                layout.prop(overlay, "display_handle", text="Handles")
 
         if context.object.mode in {'PAINT_GPENCIL', 'VERTEX_GPENCIL'}:
             layout.label(text="Vertex Paint")
@@ -6991,24 +6977,6 @@ 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 = ""
 
@@ -7650,7 +7618,6 @@ 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,



More information about the Bf-blender-cvs mailing list