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

[Antonio Vazquez]

Commit: 11bacaa70504267d1ed33308ab4746690fe7ab37
Author: Antonio Vazquez
Date:   Thu Apr 5 17:12:51 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB11bacaa70504267d1ed33308ab4746690fe7ab37

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/undo/ed_undo.c
index 52c56d30570,09abc1f3878..4e9b3b30203
--- a/source/blender/editors/undo/ed_undo.c
+++ b/source/blender/editors/undo/ed_undo.c
@@@ -33,9 -33,9 +33,11 @@@
  
  #include "MEM_guardedalloc.h"
  
+ #include "CLG_log.h"
+ 
  #include "DNA_scene_types.h"
 +#include "DNA_object_types.h"
 +#include "DNA_gpencil_types.h"
  
  #include "BLI_utildefines.h"