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

[Campbell Barton]

Commit: 2cf1bc3615dd930d2473ba9d5806f88bf7f7e661
Author: Campbell Barton
Date:   Thu Oct 19 16:58:30 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB2cf1bc3615dd930d2473ba9d5806f88bf7f7e661

Merge branch 'master' into blender2.8

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 0047828a8e2,d726a6599d2..3961c60326c
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3975,9 -4044,9 +3989,10 @@@ classes = 
      INFO_MT_edit_armature_add,
      INFO_MT_armature_add,
      INFO_MT_lamp_add,
 +    INFO_MT_lightprobe_add,
      INFO_MT_camera_add,
      INFO_MT_add,
+     VIEW3D_MT_undo_redo,
      VIEW3D_MT_object,
      VIEW3D_MT_object_animation,
      VIEW3D_MT_object_clear,