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

[Antonio Vazquez]

Commit: ec6f392bc9f8c487a8c63cdd8bc3cc17c631d143
Author: Antonio Vazquez
Date:   Tue Oct 3 18:28:51 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBec6f392bc9f8c487a8c63cdd8bc3cc17c631d143

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenkernel/intern/paint.c
index e695bab6241,40d02acab1c..e2663ddc6ac
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@@ -49,11 -47,9 +49,12 @@@
  #include "BLI_math_vector.h"
  #include "BLI_listbase.h"
  
 +#include "BLT_translation.h"
 +
 +#include "BKE_animsys.h"
  #include "BKE_brush.h"
  #include "BKE_colortools.h"
+ #include "BKE_deform.h"
  #include "BKE_main.h"
  #include "BKE_context.h"
  #include "BKE_crazyspace.h"