[Bf-blender-cvs] [8d9c1f03da1] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Joshua Leung]

Commit: 8d9c1f03da1df1516bf75124f0e34313b245cc4e
Author: Joshua Leung
Date:   Thu Oct 19 19:15:15 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB8d9c1f03da1df1516bf75124f0e34313b245cc4e

Merge branch 'blender2.8' into greasepencil-object

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

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index f69a7a0f51e,0fd2e5296e4..5e7789d591e
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -1043,8 -1089,10 +1111,11 @@@ class VIEW3D_MT_select_gpencil(Menu)
  
          layout.operator("gpencil.select_all", text="(De)select All").action = 'TOGGLE'
          layout.operator("gpencil.select_all", text="Inverse").action = 'INVERT'
+ 
+         layout.separator()
+ 
          layout.operator("gpencil.select_linked", text="Linked")
 +        layout.operator("gpencil.select_alternate")
          layout.operator_menu_enum("gpencil.select_grouped", "type", text="Grouped")
  
          layout.separator()