[Bf-extensions-cvs] [64198b88] blender2.8: Merge branch 'master' into blender2.8

[Philipp Oeser]

Commit: 64198b8817042962dcdedc71bb81ee9492b19a4d
Author: Philipp Oeser
Date:   Fri Nov 16 14:43:53 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBA64198b8817042962dcdedc71bb81ee9492b19a4d

Merge branch 'master' into blender2.8

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



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

diff --cc add_curve_extra_objects/add_curve_simple.py
index a1ed873e,15dd3e1a..cdf91717
--- a/add_curve_extra_objects/add_curve_simple.py
+++ b/add_curve_extra_objects/add_curve_simple.py
@@@ -1714,8 -1744,18 +1744,18 @@@ class VIEW3D_MT_simple_menu(Menu)
  def Simple_button(self, context):
      layout = self.layout
      layout.separator()
 -    self.layout.menu("INFO_MT_simple_menu", icon="MOD_CURVE")
 +    self.layout.menu("VIEW3D_MT_simple_menu", icon="MOD_CURVE")
  
+ class VIEW3D_MT_simple_edit_curve_menu(bpy.types.Menu):
+     bl_label = 'Simple edit'
+     
+     def draw(self, context):
+         self.layout.operator("curve.bezier_points_fillet", text="Fillet")
+         self.layout.operator("curve.bezier_spline_divide", text="Divide")
+ 
+ def Simple_curve_edit_menu(self, context):
+     self.layout.menu('VIEW3D_MT_simple_edit_curve_menu')
+     self.layout.separator()
  
  def register():
      bpy.utils.register_class(Simple)
@@@ -1723,10 -1763,11 +1763,11 @@@
      bpy.utils.register_class(BezierDivide)
      bpy.utils.register_class(SimplePanel)
      bpy.utils.register_class(SimpleEdit)
 -    bpy.utils.register_class(INFO_MT_simple_menu)
 +    bpy.utils.register_class(VIEW3D_MT_simple_menu)
      bpy.utils.register_class(SimpleVariables)
  
 -    bpy.types.INFO_MT_curve_add.append(Simple_button)
 +    bpy.types.VIEW3D_MT_curve_add.append(Simple_button)
+     bpy.types.VIEW3D_MT_edit_curve_specials.prepend(Simple_curve_edit_menu)
  
      bpy.types.Object.s_curve = PointerProperty(type=SimpleVariables)