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

[Antonio Vazquez]

Commit: 5b17fa3388408daa9437faae3d973b180e8241fc
Author: Antonio Vazquez
Date:   Wed Jun 6 21:43:02 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5b17fa3388408daa9437faae3d973b180e8241fc

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/space_outliner/outliner_select.c
index 3a0abc279c5,af1b11b28d2..7a1f74b6835
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@@ -47,10 -46,9 +47,11 @@@
  #include "BKE_armature.h"
  #include "BKE_collection.h"
  #include "BKE_context.h"
 +#include "BKE_gpencil.h"
  #include "BKE_layer.h"
+ #include "BKE_main.h"
  #include "BKE_object.h"
 +#include "BKE_paint.h"
  #include "BKE_scene.h"
  #include "BKE_sequencer.h"
  #include "BKE_workspace.h"