[Bf-blender-cvs] [9baf669493c] master: Fix T64649: Deprecated Annotation editing causes a crash

[Antonioya]

Commit: 9baf669493cfd023c467a273482d0a1a2d6a767b
Author: Antonioya
Date:   Wed May 15 20:26:26 2019 +0200
Branches: master
https://developer.blender.org/rB9baf669493cfd023c467a273482d0a1a2d6a767b

Fix T64649: Deprecated Annotation editing causes a crash

The Edit option was removed from annotations and the buttons must not be in the panel.

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 05a8735fc2f..4c77a6ad2c6 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -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()