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

[Antonio Vazquez]

Commit: 1b7b2a9a9f3b35f0636ceeb2494aabb178e33209
Author: Antonio Vazquez
Date:   Thu Sep 28 13:02:52 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1b7b2a9a9f3b35f0636ceeb2494aabb178e33209

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 2de100aad38,50359060282..033302fafe2
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -2145,11 -2101,11 +2189,13 @@@ classes = 
      VIEW3D_PT_sculpt_options,
      VIEW3D_PT_sculpt_symmetry,
      VIEW3D_PT_tools_brush_appearance,
 +    VIEW3D_PT_tools_grease_pencil_appearance,
 +    VIEW3D_PT_tools_grease_pencil_eraser,
      VIEW3D_PT_tools_weightpaint,
+     VIEW3D_PT_tools_weightpaint_symmetry,
      VIEW3D_PT_tools_weightpaint_options,
      VIEW3D_PT_tools_vertexpaint,
+     VIEW3D_PT_tools_vertexpaint_symmetry,
      VIEW3D_PT_tools_imagepaint_external,
      VIEW3D_PT_tools_imagepaint_symmetry,
      VIEW3D_PT_tools_projectpaint,