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

[Joshua Leung]

Commit: 8119b65b869850d2f2cdece31f19e19505d18782
Author: Joshua Leung
Date:   Tue Nov 14 23:49:51 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB8119b65b869850d2f2cdece31f19e19505d18782

Merge branch 'blender2.8' into greasepencil-object

Conflicts:
	source/blender/blenloader/intern/versioning_280.c

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index 53adbf850d2,7ce7ef54040..bd1da2c89ca
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -30,6 -30,12 +30,13 @@@
  
  #include <string.h>
  
+ #include "BLI_listbase.h"
++#include "BLI_math.h"
+ #include "BLI_mempool.h"
+ #include "BLI_string.h"
+ #include "BLI_string_utf8.h"
+ #include "BLI_utildefines.h"
+ 
  #include "DNA_object_types.h"
  #include "DNA_camera_types.h"
  #include "DNA_gpu_types.h"
@@@ -54,16 -59,7 +61,10 @@@
  #include "BKE_report.h"
  #include "BKE_scene.h"
  #include "BKE_workspace.h"
 +#include "BKE_gpencil.h"
 +#include "BKE_paint.h"
 +#include "BKE_object.h"
  
- #include "BLI_listbase.h"
- #include "BLI_math.h"
- #include "BLI_mempool.h"
- #include "BLI_string.h"
- #include "BLI_utildefines.h"
- 
  #include "BLO_readfile.h"
  #include "readfile.h"