[Bf-blender-cvs] [4ceb0067065] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Dalai Felinto]

Commit: 4ceb006706579a0ad2301d2cde57489b69a7683c
Author: Dalai Felinto
Date:   Wed Jun 21 15:14:42 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB4ceb006706579a0ad2301d2cde57489b69a7683c

Merge remote-tracking branch 'origin/master' into blender2.8

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



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

diff --cc source/blender/modifiers/intern/MOD_dynamicpaint.c
index 2497e0b9aab,83a42504180..b1fe3535154
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@@ -36,7 -36,7 +36,8 @@@
  
  #include "BKE_cdderivedmesh.h"
  #include "BKE_dynamicpaint.h"
 +#include "BKE_layer.h"
+ #include "BKE_library.h"
  #include "BKE_library_query.h"
  #include "BKE_modifier.h"
  
diff --cc source/blender/modifiers/intern/MOD_uvproject.c
index 362df031f92,01468c1143a..cae83282238
--- a/source/blender/modifiers/intern/MOD_uvproject.c
+++ b/source/blender/modifiers/intern/MOD_uvproject.c
@@@ -45,8 -45,8 +45,9 @@@
  
  
  #include "BKE_camera.h"
+ #include "BKE_library.h"
  #include "BKE_library_query.h"
 +#include "BKE_material.h"
  #include "BKE_mesh.h"
  #include "BKE_DerivedMesh.h"