diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-05-31 15:57:04 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-01 11:04:46 +0300 |
| commit | c338ac9454ae0e71713546096ec5fe6b547466c1 (patch) | |
| tree | 6f0988ed69e4adf2095f4c8398a8227c9ae5deb3 /source | |
| parent | 3cefb27830f13889ae4a4fbfdec03f5b8de281c5 (diff) | |
Modifiers: ported Soft Body DerivedMesh → Mesh
The simulation doesn't seem to update properly yet.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_softbody.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/modifiers/intern/MOD_softbody.c b/source/blender/modifiers/intern/MOD_softbody.c index 6e57ad53c2b..30f9829ae20 100644 --- a/source/blender/modifiers/intern/MOD_softbody.c +++ b/source/blender/modifiers/intern/MOD_softbody.c @@ -35,11 +35,11 @@ #include <stdio.h> #include "DNA_scene_types.h" +#include "DNA_mesh_types.h" #include "DNA_object_force_types.h" #include "BLI_utildefines.h" -#include "BKE_cdderivedmesh.h" #include "BKE_layer.h" #include "BKE_particle.h" #include "BKE_softbody.h" @@ -52,7 +52,7 @@ static void deformVerts( ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *UNUSED(derivedData), + Mesh *UNUSED(derivedData), float (*vertexCos)[3], int numVerts) { @@ -86,14 +86,14 @@ ModifierTypeInfo modifierType_Softbody = { /* copyData */ NULL, - /* deformVerts_DM */ deformVerts, + /* deformVerts_DM */ NULL, /* deformMatrices_DM */ NULL, /* deformVertsEM_DM */ NULL, /* deformMatricesEM_DM*/NULL, /* applyModifier_DM */ NULL, /* applyModifierEM_DM */NULL, - /* deformVerts */ NULL, + /* deformVerts */ deformVerts, /* deformMatrices */ NULL, /* deformVertsEM */ NULL, /* deformMatricesEM */ NULL, |