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

[Antonio Vazquez]

Commit: 952d9559d2b45060f98e07cc557f836741658f7c
Author: Antonio Vazquez
Date:   Sun Jun 10 16:47:02 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB952d9559d2b45060f98e07cc557f836741658f7c

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 952b7093002,1cacba82b3e..980a01c4571
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@@ -60,14 -67,9 +65,15 @@@ def draw_vpaint_symmetry(layout, vpaint
      row.prop(vpaint, "use_symmetry_z", text="Z", toggle=True)
  
      col = layout.column()
+     col.use_property_split = True
      col.prop(vpaint, "radial_symmetry", text="Radial")
  
 +# Most of these panels should not be visible in GP edit modes
 +def is_not_gpencil_edit_mode(context):
 +    is_gpmode = context.active_object and \
 +                context.active_object.mode in {'GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
 +    return not is_gpmode
 +
  
  # ********** default tools for editmode_mesh ****************