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

[Antonio Vazquez]

Commit: 56e2f990e91354f6311e928e9aa229850537e3ba
Author: Antonio Vazquez
Date:   Thu Jun 8 15:47:39 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB56e2f990e91354f6311e928e9aa229850537e3ba

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/space_view3d/view3d_select.c
index a451f6909f9,049c0367ce6..c8fbbde8a15
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@@ -73,8 -72,9 +72,10 @@@
  #include "BKE_scene.h"
  #include "BKE_tracking.h"
  #include "BKE_utildefines.h"
 +#include "BKE_workspace.h"
  
+ #include "DEG_depsgraph.h"
+ 
  #include "WM_api.h"
  #include "WM_types.h"