[c338ac9454a] blender2.8: Modifiers: ported Soft Body DerivedMesh → Mesh

[Sybren A. Stüvel]

Commit: c338ac9454ae0e71713546096ec5fe6b547466c1
Author: Sybren A. Stüvel
Date:   Thu May 31 14:57:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc338ac9454ae0e71713546096ec5fe6b547466c1

Modifiers: ported Soft Body DerivedMesh → Mesh

The simulation doesn't seem to update properly yet.

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

M	source/blender/modifiers/intern/MOD_softbody.c

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

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,