[Bf-blender-cvs] [ed0ca7258ec] blender2.8: Cleanup: more DM include removal, use BAREMESH cddata mask in constraint code.

[Bastien Montagne]

Commit: ed0ca7258ecf271c0e26a3341dcd0f74764ee53f
Author: Bastien Montagne
Date:   Wed Jun 27 11:10:00 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBed0ca7258ecf271c0e26a3341dcd0f74764ee53f

Cleanup: more DM include removal, use BAREMESH cddata mask in constraint code.

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

M	source/blender/blenkernel/intern/constraint.c
M	source/blender/windowmanager/intern/wm_init_exit.c

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

diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index bb87c76f768..0cbd77b67d2 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -3420,7 +3420,7 @@ static void shrinkwrap_get_tarmat(struct Depsgraph *depsgraph, bConstraint *con,
 		float co[3] = {0.0f, 0.0f, 0.0f};
 
 		SpaceTransform transform;
-		Mesh *target_eval = mesh_get_eval_final(depsgraph, DEG_get_input_scene(depsgraph), ct->tar, 0);
+		Mesh *target_eval = mesh_get_eval_final(depsgraph, DEG_get_input_scene(depsgraph), ct->tar, CD_MASK_BAREMESH);
 
 		BVHTreeFromMesh treeData = {NULL};
 
@@ -4092,7 +4092,8 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
 
 			if (data->depth_ob) {
 				Object *depth_ob = data->depth_ob;
-				Mesh *target_eval = mesh_get_eval_final(depsgraph, DEG_get_input_scene(depsgraph), depth_ob, 0);
+				Mesh *target_eval = mesh_get_eval_final(
+				                        depsgraph, DEG_get_input_scene(depsgraph), depth_ob, CD_MASK_BAREMESH);
 				if (target_eval) {
 					BVHTreeFromMesh treeData = NULL_BVHTreeFromMesh;
 					BVHTreeRayHit hit;
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index cae0bc06691..c1af7153b62 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -61,7 +61,6 @@
 #include "BKE_blender_undo.h"
 #include "BKE_context.h"
 #include "BKE_screen.h"
-#include "BKE_DerivedMesh.h"
 #include "BKE_global.h"
 #include "BKE_icons.h"
 #include "BKE_library.h"