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

[Antonio Vazquez]

Commit: ab53b68745ec3569662ece482029d2fe1309cf3e
Author: Antonio Vazquez
Date:   Fri May 26 20:02:21 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBab53b68745ec3569662ece482029d2fe1309cf3e

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index cb036730789,672f712d861..34b97353a4e
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -43,12 -44,10 +45,13 @@@
  #include "BKE_idprop.h"
  #include "BKE_layer.h"
  #include "BKE_main.h"
+ #include "BKE_mesh.h"
  #include "BKE_scene.h"
 +#include "BKE_gpencil.h"
 +#include "BKE_paint.h"
  
  #include "BLI_listbase.h"
 +#include "BLI_math.h"
  #include "BLI_mempool.h"
  #include "BLI_string.h"