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

[Antonio Vazquez]

Commit: 28e107f510a0985b2dab4f6065b1bd610e62c5f9
Author: Antonio Vazquez
Date:   Tue Jun 5 17:04:51 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB28e107f510a0985b2dab4f6065b1bd610e62c5f9

Merge branch 'blender2.8' into greasepencil-object

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

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



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

diff --cc release/scripts/startup/bl_ui/space_clip.py
index d65f9f5d37a,40009090231..21ae18d3cbc
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@@ -1186,8 -1190,8 +1188,9 @@@ class CLIP_PT_tools_grease_pencil_brush
  # Grease Pencil drawing curves
  class CLIP_PT_tools_grease_pencil_brushcurves(GreasePencilBrushCurvesPanel, Panel):
      bl_space_type = 'CLIP_EDITOR'
 +    bl_region_type = 'TOOLS'
  
+ 
  class CLIP_MT_view(Menu):
      bl_label = "View"
  
diff --cc release/scripts/startup/bl_ui/space_node.py
index e00a034a60a,bf3fa64a852..6ef498ff76f
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@@ -533,19 -548,9 +535,21 @@@ class NODE_PT_tools_grease_pencil_brush
      bl_space_type = 'NODE_EDITOR'
      bl_region_type = 'TOOLS'
  
 +# Grease Pencil palette colors
 +class NODE_PT_grease_pencil_palettecolor(GreasePencilPaletteColorPanel, Panel):
 +    bl_space_type = 'NODE_EDITOR'
 +    bl_region_type = 'TOOLS'
 +
 +    # NOTE: this is just a wrapper around the generic GP Panel
 +
 +    @classmethod
 +    def poll(cls, context):
 +        snode = context.space_data
 +        return snode is not None and snode.node_tree is not None
 +
  # Grease Pencil drawing curves
+ 
+ 
  class NODE_PT_tools_grease_pencil_brushcurves(GreasePencilBrushCurvesPanel, Panel):
      bl_space_type = 'NODE_EDITOR'
      bl_region_type = 'TOOLS'
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 60443420fc2,4d680477151..317400936fe
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -4132,16 -3986,12 +4036,11 @@@ classes = 
      VIEW3D_MT_edit_armature_delete,
      VIEW3D_MT_edit_gpencil_transform,
      VIEW3D_MT_edit_gpencil_interpolate,
 -    VIEW3D_PT_grease_pencil,
 -    VIEW3D_PT_grease_pencil_palettecolor,
      VIEW3D_PT_view3d_properties,
      VIEW3D_PT_view3d_cursor,
-     VIEW3D_PT_view3d_name,
 +    VIEW3D_PT_gp_paper,
      VIEW3D_PT_quad_view,
      VIEW3D_PT_view3d_stereo,
-     VIEW3D_PT_view3d_motion_tracking,
-     VIEW3D_PT_view3d_meshdisplay,
-     VIEW3D_PT_view3d_meshstatvis,
-     VIEW3D_PT_view3d_curvedisplay,
      VIEW3D_PT_shading,
      VIEW3D_PT_overlay,
      VIEW3D_PT_transform_orientations,