Revision: 44389
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44389
Author: blendix
Date: 2012-02-23 21:07:22 +0000 (Thu, 23 Feb 2012)
Log Message:
-----------
Fix #30268: cloth collision and springs not working after bmesh merge,
these cloth and collision modifiers require tesselation still.
Modified Paths:
--------------
trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
trunk/blender/source/blender/modifiers/intern/MOD_collision.c
Modified: trunk/blender/source/blender/modifiers/intern/MOD_cloth.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_cloth.c 2012-02-23
20:58:41 UTC (rev 44388)
+++ trunk/blender/source/blender/modifiers/intern/MOD_cloth.c 2012-02-23
21:07:22 UTC (rev 44389)
@@ -89,6 +89,8 @@
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) {
Modified: trunk/blender/source/blender/modifiers/intern/MOD_collision.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_collision.c
2012-02-23 20:58:41 UTC (rev 44388)
+++ trunk/blender/source/blender/modifiers/intern/MOD_collision.c
2012-02-23 21:07:22 UTC (rev 44389)
@@ -166,6 +166,8 @@
collmd->numverts = numverts;
+ DM_ensure_tessface(dm); /* BMESH - UNTIL
MODIFIER IS UPDATED FOR MPoly */
+
collmd->mfaces = dm->dupTessFaceArray(dm);
collmd->numfaces = dm->getNumTessFaces(dm);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
