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

[Antonio Vazquez]

Commit: b85916efdde432bca68bb19b705ee4f707f58c17
Author: Antonio Vazquez
Date:   Mon Aug 7 11:28:42 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb85916efdde432bca68bb19b705ee4f707f58c17

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/object/object_transform.c
index 72673ca9dad,cf68bd3e419..18784262228
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@@ -39,7 -39,7 +39,8 @@@
  #include "DNA_scene_types.h"
  #include "DNA_group_types.h"
  #include "DNA_lattice_types.h"
+ #include "DNA_lamp_types.h"
 +#include "DNA_gpencil_types.h"
  
  #include "BLI_math.h"
  #include "BLI_listbase.h"
@@@ -73,8 -73,9 +75,10 @@@
  #include "ED_mesh.h"
  #include "ED_screen.h"
  #include "ED_view3d.h"
 +#include "ED_gpencil.h"
  
+ #include "MEM_guardedalloc.h"
+ 
  #include "object_intern.h"
  
  /*************************** Clear Transformation ****************************/