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

[Antonio Vazquez]

Commit: c0c0483244ca2198fd022c1295e6b9128f440ed1
Author: Antonio Vazquez
Date:   Thu Jun 1 10:42:41 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc0c0483244ca2198fd022c1295e6b9128f440ed1

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 34b97353a4e,3eeb0fc78e4..3cebaa78746
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -37,9 -37,7 +37,8 @@@
  #include "DNA_scene_types.h"
  #include "DNA_screen_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_types.h"
  
- #include "BKE_blender.h"
  #include "BKE_collection.h"
  #include "BKE_customdata.h"
  #include "BKE_idprop.h"