diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-15 17:21:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-15 17:21:43 +0300 |
| commit | 9bac3ffd3f691a9bb1280694668e643c6ed3bb18 (patch) | |
| tree | a047c01662f904fd92fb55bf212742e2be2e46e9 /source/blender/modifiers/intern/MOD_meshcache.c | |
| parent | b262fba5e379b8f9d04af850e30e3e431db2b8c4 (diff) | |
Cleanup: stop using DerivedMesh in mesh cache modifier.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_meshcache.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_meshcache.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/source/blender/modifiers/intern/MOD_meshcache.c b/source/blender/modifiers/intern/MOD_meshcache.c index 8d2ac001e2d..3263641896f 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.c +++ b/source/blender/modifiers/intern/MOD_meshcache.c @@ -36,7 +36,6 @@ #include "BLI_path_util.h" #include "BLI_math.h" -#include "BKE_DerivedMesh.h" #include "BKE_scene.h" #include "BKE_global.h" #include "BKE_mesh.h" @@ -82,7 +81,7 @@ static bool isDisabled(const struct Scene *UNUSED(scene), ModifierData *md, bool static void meshcache_do( - MeshCacheModifierData *mcmd, Scene *scene, Object *ob, DerivedMesh *UNUSED(dm), + MeshCacheModifierData *mcmd, Scene *scene, Object *ob, float (*vertexCos_Real)[3], int numVerts) { const bool use_factor = mcmd->factor < 1.0f; @@ -266,24 +265,27 @@ static void meshcache_do( static void deformVerts( ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *derivedData, + Mesh *UNUSED(mesh), float (*vertexCos)[3], int numVerts) { MeshCacheModifierData *mcmd = (MeshCacheModifierData *)md; Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph); - meshcache_do(mcmd, scene, ctx->object, derivedData, vertexCos, numVerts); + meshcache_do(mcmd, scene, ctx->object, vertexCos, numVerts); } static void deformVertsEM( - ModifierData *md, const ModifierEvalContext *ctx, struct BMEditMesh *UNUSED(editData), - DerivedMesh *derivedData, float (*vertexCos)[3], int numVerts) + ModifierData *md, const ModifierEvalContext *ctx, + struct BMEditMesh *UNUSED(editData), + Mesh *UNUSED(mesh), + float (*vertexCos)[3], + int numVerts) { MeshCacheModifierData *mcmd = (MeshCacheModifierData *)md; Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph); - meshcache_do(mcmd, scene, ctx->object, derivedData, vertexCos, numVerts); + meshcache_do(mcmd, scene, ctx->object, vertexCos, numVerts); } @@ -298,16 +300,16 @@ ModifierTypeInfo modifierType_MeshCache = { /* copyData */ modifier_copyData_generic, - /* deformVerts_DM */ deformVerts, + /* deformVerts_DM */ NULL, /* deformMatrices_DM */ NULL, - /* deformVertsEM_DM */ deformVertsEM, + /* deformVertsEM_DM */ NULL, /* deformMatricesEM_DM*/NULL, /* applyModifier_DM */ NULL, /* applyModifierEM_DM */NULL, - /* deformVerts */ NULL, + /* deformVerts */ deformVerts, /* deformMatrices */ NULL, - /* deformVertsEM */ NULL, + /* deformVertsEM */ deformVertsEM, /* deformMatricesEM */ NULL, /* applyModifier */ NULL, /* applyModifierEM */ NULL, |