diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-12-02 07:06:02 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-12-02 07:06:02 +0300 |
| commit | 1dbc93b540ade1d7883bb9e3080e4581ddf2c4dc (patch) | |
| tree | ba112ac03b59696c727c976affc62033c2f8222d /source | |
| parent | e75ef3551e853efdf22e03b4215c5c3b25d88baf (diff) | |
Additional fix for #24958 Cloth pinning not working
* Don't assume that the original dm given to cloth modifier is a cddm
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index be715fac352..b781b18862c 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -936,7 +936,7 @@ static void cloth_from_mesh ( ClothModifierData *clmd, DerivedMesh *dm ) { unsigned int numverts = dm->getNumVerts ( dm ); unsigned int numfaces = dm->getNumFaces ( dm ); - MFace *mface = CDDM_get_faces(dm); + MFace *mface = dm->getFaceArray( dm ); unsigned int i = 0; /* Allocate our vertices. */ @@ -1049,8 +1049,8 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) unsigned int numverts = (unsigned int)dm->getNumVerts ( dm ); unsigned int numedges = (unsigned int)dm->getNumEdges ( dm ); unsigned int numfaces = (unsigned int)dm->getNumFaces ( dm ); - MEdge *medge = CDDM_get_edges ( dm ); - MFace *mface = CDDM_get_faces ( dm ); + MEdge *medge = dm->getEdgeArray ( dm ); + MFace *mface = dm->getFaceArray ( dm ); int index2 = 0; // our second vertex index LinkNode **edgelist = NULL; EdgeHash *edgehash = NULL; |