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

[Campbell Barton]

Commit: fe9f5fd557d0a059c48fdfe4d027df921eae617d
Author: Campbell Barton
Date:   Thu Oct 19 16:55:08 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBfe9f5fd557d0a059c48fdfe4d027df921eae617d

Merge branch 'master' into blender2.8

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index f2c5e2ea732,a0051688a8e..0047828a8e2
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -447,15 -446,13 +452,12 @@@ class VIEW3D_MT_view(Menu)
  
          layout.separator()
  
-         layout.operator("view3d.viewnumpad", text="Camera").type = 'CAMERA'
-         layout.operator("view3d.viewnumpad", text="Top").type = 'TOP'
-         layout.operator("view3d.viewnumpad", text="Bottom").type = 'BOTTOM'
-         layout.operator("view3d.viewnumpad", text="Front").type = 'FRONT'
-         layout.operator("view3d.viewnumpad", text="Back").type = 'BACK'
-         layout.operator("view3d.viewnumpad", text="Right").type = 'RIGHT'
-         layout.operator("view3d.viewnumpad", text="Left").type = 'LEFT'
+         layout.operator("view3d.view_selected").use_all_regions = False
+         if view.region_quadviews:
+             layout.operator("view3d.view_selected", text="View Selected (Quad View)").use_all_regions = True
  
-         layout.menu("VIEW3D_MT_view_cameras", text="Cameras")
+         layout.operator("view3d.view_all").center = False
 -        layout.operator("view3d.localview", text="View Global/Local")
+         layout.operator("view3d.view_persportho")
  
          layout.separator()