[Bf-blender-cvs] [b4aeb8df198] greasepencil-object: GPencil: Fix some minor problems with merge

[Antonioya]

Commit: b4aeb8df198e53a86e2a0c6013f8b6f8922b0af8
Author: Antonioya
Date:   Fri Aug 9 17:57:17 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb4aeb8df198e53a86e2a0c6013f8b6f8922b0af8

GPencil: Fix some minor problems with merge

As the code was ain the branch already, the previous merge had some problems.

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

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 41b9f756e6e..65619ffd285 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4504,21 +4504,6 @@ class VIEW3D_MT_edit_gpencil_stroke(Menu):
 class VIEW3D_MT_edit_gpencil_point(Menu):
     bl_label = "Point"
 
-    def draw(self, _context):
-        layout = self.layout
-
-        layout.operator("gpencil.extrude_move", text="Extrude Points")
-
-        layout.separator()
-
-        layout.operator("gpencil.stroke_smooth", text="Smooth Points").only_selected = True
-
-        layout.separator()
-
-        layout.operator("gpencil.stroke_merge", text="Merge Points")
-
-        # TODO: add new RIP operator
-
     def draw(self, _context):
         layout = self.layout
 
@@ -4600,24 +4585,6 @@ class VIEW3D_MT_edit_gpencil_transform(Menu):
         layout.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN'
 
 
-class VIEW3D_MT_edit_gpencil_interpolate(Menu):
-    bl_label = "Interpolate"
-
-    def draw(self, _context):
-        layout = self.layout
-
-        layout.operator("gpencil.interpolate", text="Interpolate")
-        layout.operator("gpencil.interpolate_sequence", text="Sequence")
-
-class VIEW3D_MT_edit_gpencil_showhide(Menu):
-    bl_label = "Show/hide"
-
-    def draw(self, _context):
-        layout = self.layout
-
-        layout.operator("gpencil.hide", text="Hide Active Layer")
-        layout.operator("gpencil.reveal", text="Show All Layers")
-
         layout.operator("gpencil.interpolate", text="Interpolate")
         layout.operator("gpencil.interpolate_sequence", text="Sequence")