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

Antonio Vazquez noreply at git.blender.org
Thu Aug 8 10:34:51 CEST 2019


Commit: 167565f1dcaf6729bd15f6cb451aca461189ee9f
Author: Antonio Vazquez
Date:   Thu Aug 8 10:34:35 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB167565f1dcaf6729bd15f6cb451aca461189ee9f

Merge branch 'master' into greasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/space_view3d.py

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 46bfcfa20c4,2eeb13310fa..a2a4525b9be
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -4528,34 -4524,21 +4526,34 @@@ class VIEW3D_MT_edit_gpencil(Menu)
  
          layout.separator()
  
-         layout.menu("VIEW3D_MT_weight_gpencil")        
 -        layout.operator("gpencil.stroke_smooth", text="Smooth")
 -        layout.operator("gpencil.stroke_subdivide", text="Subdivide")
++        layout.menu("VIEW3D_MT_weight_gpencil")
 +
 +        layout.separator()
-                 
-         layout.menu("VIEW3D_MT_edit_gpencil_showhide")        
++
++        layout.menu("VIEW3D_MT_edit_gpencil_showhide")
 +
 +        layout.operator_menu_enum("gpencil.stroke_separate", "mode")
 +        layout.menu("GPENCIL_MT_cleanup")
 +
 +        layout.separator()
 +
 +        # Remove
-         layout.menu("VIEW3D_MT_edit_gpencil_delete")        
-         
++        layout.menu("VIEW3D_MT_edit_gpencil_delete")
++
 +
 +class VIEW3D_MT_edit_gpencil_stroke(Menu):
 +    bl_label = "Stroke"
 +
 +    def draw(self, _context):
 +        layout = self.layout
-         
++
 +        layout.operator("gpencil.stroke_subdivide", text="Subdivide").only_selected = False
          layout.menu("VIEW3D_MT_gpencil_simplify")
          layout.operator("gpencil.stroke_trim", text="Trim")
  
          layout.separator()
-           
-         layout.operator_menu_enum("gpencil.stroke_join", "type", text="Join...")        
+ 
 -        layout.operator_menu_enum("gpencil.stroke_separate", "mode", text="Separate...")
 -        layout.operator("gpencil.stroke_split", text="Split")
 -        layout.operator("gpencil.stroke_merge", text="Merge")
 -        op = layout.operator("gpencil.stroke_cyclical_set", text="Close")
 -        op.type = 'CLOSE'
 -        op.geometry = True
+         layout.operator_menu_enum("gpencil.stroke_join", "type", text="Join...")
 -        layout.operator("gpencil.stroke_flip", text="Flip Direction")
  
          layout.separator()
  
@@@ -4566,35 -4549,14 +4564,35 @@@
          layout.separator()
  
          # Convert
 +        op = layout.operator("gpencil.stroke_cyclical_set", text="Close")
 +        op.type = 'CLOSE'
 +        op.geometry = True
-         layout.operator("gpencil.stroke_cyclical_set", text="Toggle Cyclic").type = 'TOGGLE'        
+         layout.operator("gpencil.stroke_cyclical_set", text="Toggle Cyclic").type = 'TOGGLE'
          layout.operator_menu_enum("gpencil.stroke_caps_set", text="Toggle Caps...", property="type")
 +        layout.operator("gpencil.stroke_flip", text="Switch Direction")
 +
 +
 +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()
-         
+ 
 -        # Remove
 -        layout.menu("GPENCIL_MT_cleanup")
 -        layout.menu("VIEW3D_MT_edit_gpencil_delete")
 +        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_vertex_group")
  
  
  class VIEW3D_MT_weight_gpencil(Menu):
@@@ -4627,10 -4587,10 +4625,10 @@@ class VIEW3D_MT_gpencil_animation(Menu)
      def draw(self, _context):
          layout = self.layout
  
-         layout.operator("gpencil.blank_frame_add")        
+         layout.operator("gpencil.blank_frame_add")
 -        layout.operator("gpencil.active_frames_delete_all", text="Delete Frame(s)")
  
          layout.separator()
 +
          layout.operator("gpencil.frame_duplicate", text="Duplicate Active Frame")
          layout.operator("gpencil.frame_duplicate", text="Duplicate All Layers").mode = 'ALL'
  
@@@ -4658,25 -4613,6 +4656,25 @@@ class VIEW3D_MT_edit_gpencil_transform(
          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")
 +
 +
  class VIEW3D_MT_object_mode_pie(Menu):
      bl_label = "Mode"



More information about the Bf-blender-cvs mailing list