diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-24 01:07:22 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-02-24 01:07:22 +0400 |
| commit | f39c1493916b3f4d4d858c7fe6f5348ba6ccc26d (patch) | |
| tree | 0b83828200ede697b31bba62d0e87a3346691836 /source/blender/modifiers/intern | |
| parent | d7155295bbcfd4606d2fead0d700820d8dc1ffeb (diff) | |
Fix #30268: cloth collision and springs not working after bmesh merge,
these cloth and collision modifiers require tesselation still.
Diffstat (limited to 'source/blender/modifiers/intern')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_cloth.c | 2 | ||||
| -rw-r--r-- | source/blender/modifiers/intern/MOD_collision.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index fdb584ec592..51ba9103976 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -89,6 +89,8 @@ static void deformVerts(ModifierData *md, Object *ob, DerivedMesh *derivedData, CDDM_apply_vert_coords(dm, vertexCos); + DM_ensure_tessface(dm); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */ + clothModifier_do(clmd, md->scene, ob, dm, vertexCos); if(result) { diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index 92ef79b4a8e..1476c792169 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -166,6 +166,8 @@ static void deformVerts(ModifierData *md, Object *ob, collmd->numverts = numverts; + DM_ensure_tessface(dm); /* BMESH - UNTIL MODIFIER IS UPDATED FOR MPoly */ + collmd->mfaces = dm->dupTessFaceArray(dm); collmd->numfaces = dm->getNumTessFaces(dm); |