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

[Antonio Vazquez]

Commit: 4a9b3a76b536416d93e7ec833cc648bb872146a8
Author: Antonio Vazquez
Date:   Fri Jun 1 09:10:48 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB4a9b3a76b536416d93e7ec833cc648bb872146a8

Merge branch 'blender2.8' into greasepencil-object

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

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



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

diff --cc release/scripts/startup/bl_ui/space_topbar.py
index 1ff01045873,243b36bdeb7..cc99a583cbf
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@@ -156,17 -139,9 +156,17 @@@ class TOPBAR_HT_lower_bar(Header)
          elif mode == 'EDIT_MESH':
              pass
          elif mode == 'POSE':
-             layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".posemode", category="")
+             pass
          elif mode == 'PARTICLE':
-             layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".paint_common", category="")
+             pass
 +        elif mode == 'GPENCIL_PAINT':
 +            layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".greasepencil_paint", category="")
 +        elif mode == 'GPENCIL_EDIT':
 +            layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".greasepencil_edit", category="")
 +        elif mode == 'GPENCIL_SCULPT':
 +            layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".greasepencil_sculpt", category="")
 +        elif mode == 'GPENCIL_WEIGHT':
 +            layout.popover_group(space_type='VIEW_3D', region_type='TOOLS', context=".greasepencil_weight", category="")
  
      def draw_right(self, context):
          layout = self.layout