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

[Antonio Vazquez]

Commit: df9b547323d95c5199695cb31cc3cbbc573f5260
Author: Antonio Vazquez
Date:   Mon Nov 20 10:42:27 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBdf9b547323d95c5199695cb31cc3cbbc573f5260

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/space_view3d/view3d_select.c
index 23ac3e0313f,297bd5c4aa1..1c29e8350a3
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@@ -72,8 -71,6 +72,7 @@@
  #include "BKE_editmesh.h"
  #include "BKE_scene.h"
  #include "BKE_tracking.h"
- #include "BKE_utildefines.h"
 +#include "BKE_workspace.h"
  
  #include "DEG_depsgraph.h"
  
diff --cc source/blender/editors/transform/transform_generics.c
index aec9a1cdfe0,8d2fb595e24..98b4bf9ceb7
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@@ -81,9 -81,7 +81,8 @@@
  #include "BKE_editmesh.h"
  #include "BKE_tracking.h"
  #include "BKE_mask.h"
- #include "BKE_utildefines.h"
  #include "BKE_workspace.h"
 +#include "BKE_gpencil.h"
  
  #include "DEG_depsgraph.h"