[Bf-blender-cvs] [947bc017aa5] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 947bc017aa51493e0f3c52bfaa8d406dae6241ec
Author: Campbell Barton
Date:   Thu Oct 19 17:01:40 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB947bc017aa51493e0f3c52bfaa8d406dae6241ec

Merge branch 'master' into blender2.8

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 3961c60326c,f6d72ac2853..47cea5f4b88
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -1381,8 -1388,8 +1402,6 @@@ class VIEW3D_MT_object(Menu)
  
      def draw(self, context):
          layout = self.layout
--        view = context.space_data
--        is_local_view = (view.local_view is not None)
  
          layout.menu("VIEW3D_MT_undo_redo")
  
@@@ -1402,12 -1414,19 +1426,12 @@@
  
          layout.operator("object.duplicate_move")
          layout.operator("object.duplicate_move_linked")
-         layout.operator("object.delete", text="Delete...").use_global = False
-         layout.operator("object.proxy_make", text="Make Proxy...")
+         layout.operator("object.join")
 -        if is_local_view:
 -            layout.operator_context = 'EXEC_REGION_WIN'
 -            layout.operator("object.move_to_layer", text="Move out of Local View")
 -            layout.operator_context = 'INVOKE_REGION_WIN'
 -        else:
 -            layout.operator("object.move_to_layer", text="Move to Layer...")
 -
+         layout.separator()
          layout.menu("VIEW3D_MT_make_links", text="Make Links...")
-         layout.operator("object.make_dupli_face")
-         layout.operator_menu_enum("object.make_local", "type", text="Make Local...")
-         layout.menu("VIEW3D_MT_make_single_user")
+         layout.menu("VIEW3D_MT_object_relations")
+         layout.menu("VIEW3D_MT_object_constraints")
+         layout.menu("VIEW3D_MT_object_track")
  
          layout.separator()
  
@@@ -1426,12 -1442,8 +1447,6 @@@
  
          layout.separator()
  
-         layout.operator("object.join")
-         layout.operator("object.data_transfer")
-         layout.operator("object.datalayout_transfer")
- 
-         layout.separator()
 -        layout.menu("VIEW3D_MT_object_showhide")
--
          layout.operator_menu_enum("object.convert", "target")