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

[Antonio Vazquez]

Commit: ae8620b3ae3ea0a4fb6d6e2ca9d947443d301416
Author: Antonio Vazquez
Date:   Wed Jun 20 19:26:07 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBae8620b3ae3ea0a4fb6d6e2ca9d947443d301416

Merge branch 'blender2.8' into greasepencil-object

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

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



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

diff --cc release/scripts/startup/bl_ui/properties_scene.py
index b1b447b8319,a4991ef5718..6d874c3ef03
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@@ -28,15 -28,12 +28,15 @@@ from rna_prop_ui import PropertyPane
  from bl_operators.presets import PresetMenu
  
  from .properties_physics_common import (
 -    point_cache_ui,
 -    effector_weights_ui,
 -)
 +        point_cache_ui,
 +        effector_weights_ui,
 +        )
 +from .properties_grease_pencil_common import (
 +        GreasePencilDataPanel
 +        )
  
  
- class SCENE_MT_units_length_presets(PresetMenu):
+ class SCENE_PT_units_length_presets(PresetMenu):
      """Unit of measure for properties that use length values"""
      bl_label = "Unit Presets"
      preset_subdir = "units_length"
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 66083fcbc64,0dbbf3ab927..11904266c9c
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -4397,11 -4304,12 +4399,11 @@@ classes = 
      VIEW3D_MT_edit_armature_delete,
      VIEW3D_MT_edit_gpencil_transform,
      VIEW3D_MT_edit_gpencil_interpolate,
-     VIEW3D_PIE_object_mode,
-     VIEW3D_PIE_view,
+     VIEW3D_MT_object_mode_pie,
+     VIEW3D_MT_view_pie,
 -    VIEW3D_PT_grease_pencil,
 -    VIEW3D_PT_grease_pencil_palettecolor,
      VIEW3D_PT_view3d_properties,
      VIEW3D_PT_view3d_cursor,
 +    VIEW3D_PT_gp_paper,
      VIEW3D_PT_quad_view,
      VIEW3D_PT_view3d_stereo,
      VIEW3D_PT_shading,