From 74234688dede52bbe5b37741042dbc1bed9611bf Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 9 May 2018 12:51:03 +0200 Subject: Modifier stack: ShrinkWrap: move to mesh-based BVHTree code. Now only subsurf still needs some DM... --- source/blender/blenkernel/BKE_shrinkwrap.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/BKE_shrinkwrap.h') diff --git a/source/blender/blenkernel/BKE_shrinkwrap.h b/source/blender/blenkernel/BKE_shrinkwrap.h index 79e60b1a6a0..36caad86cf7 100644 --- a/source/blender/blenkernel/BKE_shrinkwrap.h +++ b/source/blender/blenkernel/BKE_shrinkwrap.h @@ -51,8 +51,8 @@ struct DerivedMesh; struct Mesh; struct MVert; struct MDeformVert; +struct ModifierEvalContext; struct ShrinkwrapModifierData; -struct MDeformVert; struct BVHTree; struct SpaceTransform; @@ -70,8 +70,7 @@ typedef struct ShrinkwrapCalcData { int vgroup; //Vertex group num bool invert_vgroup; /* invert vertex group influence */ - /* TODO to be moved to Mesh once we are done with changes in BVHTree helper code. */ - struct DerivedMesh *target; //mesh we are shrinking to + struct Mesh *target; //mesh we are shrinking to struct SpaceTransform local2target; //transform to move between local and target space float keepDist; //Distance to keep above target surface (units are in local space) @@ -79,7 +78,7 @@ typedef struct ShrinkwrapCalcData { } ShrinkwrapCalcData; void shrinkwrapModifier_deform(struct ShrinkwrapModifierData *smd, struct Object *ob, struct Mesh *mesh, - float (*vertexCos)[3], int numVerts, bool for_render); + float (*vertexCos)[3], int numVerts, const struct ModifierEvalContext *ctx); /* * This function casts a ray in the given BVHTree.. but it takes into consideration the space_transform, that is: -- cgit v1.2.3