[Bf-blender-cvs] [b6d63d5a97b] greasepencil-object: Fix errors after merge

[Antonio Vazquez]

Commit: b6d63d5a97b67331505a3731833e06642b484fd4
Author: Antonio Vazquez
Date:   Mon Apr 2 16:18:52 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb6d63d5a97b67331505a3731833e06642b484fd4

Fix errors after merge

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

M	source/blender/editors/space_outliner/outliner_select.c
M	source/blender/editors/undo/ed_undo.c

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

diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c
index c632342669f..6fe866d0f70 100644
--- a/source/blender/editors/space_outliner/outliner_select.c
+++ b/source/blender/editors/space_outliner/outliner_select.c
@@ -62,7 +62,6 @@
 #include "ED_screen.h"
 #include "ED_sequencer.h"
 #include "ED_undo.h"
-#include "ED_util.h"
 #include "ED_gpencil.h"
 
 #include "WM_api.h"
diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c
index f77a41502a3..02768b75cd0 100644
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@ -34,6 +34,7 @@
 #include "MEM_guardedalloc.h"
 
 #include "DNA_scene_types.h"
+#include "DNA_object_types.h"
 #include "DNA_gpencil_types.h"
 
 #include "BLI_utildefines.h"
@@ -50,6 +51,7 @@
 
 #include "ED_gpencil.h"
 #include "ED_render.h"
+#include "ED_object.h"
 #include "ED_screen.h"
 #include "ED_undo.h"