[Bf-blender-cvs] [a1bbf5200d1] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: a1bbf5200d1eeb9ca8181d066aef16c89fb3bb5a
Author: Antonio Vazquez
Date:   Fri Aug 9 17:43:40 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa1bbf5200d1eeb9ca8181d066aef16c89fb3bb5a

Merge branch 'master' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 52e38d904a7,cfe4a06dcc0..41b9f756e6e
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -4489,18 -4510,18 +4510,33 @@@ class VIEW3D_MT_edit_gpencil_point(Menu
          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
++
++        layout.operator("gpencil.extrude_move", text="Extrude Points")
++
 +        layout.separator()
 +
-         layout.menu("VIEW3D_MT_vertex_group")
+         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        
++
++        # TODO: add new RIP operator
+ 
+         layout.separator()
 -        
++
+         layout.menu("VIEW3D_MT_gpencil_vertex_group")
  
  
  class VIEW3D_MT_weight_gpencil(Menu):
@@@ -4573,12 -4588,12 +4609,24 @@@ class VIEW3D_MT_edit_gpencil_interpolat
          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")
++
 +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")