Fix T64649: Deprecated Annotation editing causes a crash
authorAntonioya <blendergit@gmail.com>
Wed, 15 May 2019 18:26:26 +0000 (20:26 +0200)
committerAntonioya <blendergit@gmail.com>
Wed, 15 May 2019 18:26:26 +0000 (20:26 +0200)
The Edit option was removed from annotations and the buttons must not be in the panel.

release/scripts/startup/bl_ui/properties_grease_pencil_common.py

index 05a8735..4c77a6a 100644 (file)
@@ -130,15 +130,6 @@ class AnnotationDrawingToolsPanel:
 
         gpencil_stroke_placement_settings(context, col)
 
-        gpd = context.gpencil_data
-
-        if gpd and not is_3d_view:
-            layout.separator()
-            layout.separator()
-
-            col = layout.column(align=True)
-            col.prop(gpd, "use_stroke_edit_mode", text="Enable Editing", toggle=True)  # was: icon='EDIT'
-
 
 class GreasePencilStrokeEditPanel:
     # subclass must set
@@ -802,18 +793,6 @@ class GreasePencilToolsPanel:
 
         gpd = context.gpencil_data
 
-        layout.prop(gpd, "use_stroke_edit_mode", text="Enable Editing", icon='EDIT', toggle=True)
-
-        layout.separator()
-
-        layout.label(text="Proportional Edit:")
-        row = layout.row()
-        row.prop(context.tool_settings, "use_proportional_edit", text="")
-        row.prop(context.tool_settings, "proportional_edit_falloff", text="")
-
-        layout.separator()
-        layout.separator()
-
         gpencil_active_brush_settings_simple(context, layout)
 
         layout.separator()