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

[Antonio Vazquez]

Commit: f01b8bcd0b5301e7ccd556f9f3077d8a1dcc055c
Author: Antonio Vazquez
Date:   Mon Apr 2 15:58:34 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf01b8bcd0b5301e7ccd556f9f3077d8a1dcc055c

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/editors/space_outliner/outliner_select.c

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



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

diff --cc source/blender/editors/object/object_edit.c
index 37f27932a6c,dab45a03b8a..3990a93127e
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@@ -100,9 -100,8 +100,9 @@@
  #include "ED_lattice.h"
  #include "ED_object.h"
  #include "ED_screen.h"
- #include "ED_util.h"
+ #include "ED_undo.h"
  #include "ED_image.h"
 +#include "ED_gpencil.h"
  
  #include "RNA_access.h"
  #include "RNA_define.h"
diff --cc source/blender/editors/space_outliner/outliner_select.c
index b1ea4372094,018756f2a99..c632342669f
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@@ -61,8 -57,7 +61,9 @@@
  #include "ED_object.h"
  #include "ED_screen.h"
  #include "ED_sequencer.h"
+ #include "ED_undo.h"
 +#include "ED_util.h"
 +#include "ED_gpencil.h"
  
  #include "WM_api.h"
  #include "WM_types.h"
diff --cc source/blender/editors/undo/ed_undo.c
index 1c8ebd8f4e4,691ba066bf9..f77a41502a3
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@@ -34,10 -33,7 +33,8 @@@
  
  #include "MEM_guardedalloc.h"
  
- #include "DNA_object_types.h"
  #include "DNA_scene_types.h"
 +#include "DNA_gpencil_types.h"
  
  #include "BLI_utildefines.h"
  
@@@ -46,28 -42,13 +43,15 @@@
  #include "BKE_blender_undo.h"
  #include "BKE_context.h"
  #include "BKE_global.h"
- #include "BKE_library_override.h"
- #include "BKE_main.h"
  #include "BKE_screen.h"
  #include "BKE_undo_system.h"
 +#include "BKE_workspace.h"
 +#include "BKE_paint.h"
  
- #include "DEG_depsgraph.h"
- 
- #include "ED_armature.h"
- #include "ED_particle.h"
- #include "ED_curve.h"
  #include "ED_gpencil.h"
- #include "ED_lattice.h"
- #include "ED_mball.h"
- #include "ED_mesh.h"
- #include "ED_object.h"
  #include "ED_render.h"
  #include "ED_screen.h"
- #include "ED_paint.h"
- #include "ED_util.h"
- #include "ED_text.h"
+ #include "ED_undo.h"
  
  #include "WM_api.h"
  #include "WM_types.h"