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

[Antonio Vazquez]

Commit: 3bfeb28b1ede312577fd453af643072331e828d1
Author: Antonio Vazquez
Date:   Tue Apr 3 18:40:11 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB3bfeb28b1ede312577fd453af643072331e828d1

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/editors/gpencil/gpencil_data.c
	source/blender/editors/gpencil/gpencil_paint.c

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



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

diff --cc source/blender/editors/undo/ed_undo.c
index 02768b75cd0,4f62e38dc0b..52c56d30570
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@@ -44,10 -42,9 +44,11 @@@
  #include "BKE_blender_undo.h"
  #include "BKE_context.h"
  #include "BKE_global.h"
+ #include "BKE_main.h"
  #include "BKE_screen.h"
  #include "BKE_undo_system.h"
 +#include "BKE_workspace.h"
 +#include "BKE_paint.h"
  
  #include "ED_gpencil.h"
  #include "ED_render.h"