Revision: 49861 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49861 Author: genscher Date: 2012-08-12 22:54:35 +0000 (Sun, 12 Aug 2012) Log Message: ----------- Bugfix Cloth: Hooks were broken by recent changes.
This makes it looks like if part 1 of the Dynamic Paint regression blend file fails, but actually it's correct. Modified Paths: -------------- trunk/blender/source/blender/blenkernel/intern/cloth.c Modified: trunk/blender/source/blender/blenkernel/intern/cloth.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-08-12 22:50:21 UTC (rev 49860) +++ trunk/blender/source/blender/blenkernel/intern/cloth.c 2012-08-12 22:54:35 UTC (rev 49861) @@ -400,18 +400,8 @@ copy_v3_v3(verts->txold, verts->x); /* Get the current position. */ - if ((clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_GOAL) && - ((!(cloth->verts[i].flags & CLOTH_VERT_FLAG_PINNED)) - && (cloth->verts[i].goal > ALMOST_ZERO))) - { - copy_v3_v3(verts->xconst, mvert[i].co); - mul_m4_v3(ob->obmat, verts->xconst); - } - else - { - /* This fixed animated goals not to jump back to "first frame position" */ - copy_v3_v3(verts->xconst, verts->txold); - } + copy_v3_v3(verts->xconst, mvert[i].co); + mul_m4_v3(ob->obmat, verts->xconst); } effectors = pdInitEffectors(clmd->scene, ob, NULL, clmd->sim_parms->effector_weights); @@ -1165,7 +1155,7 @@ if ( spring ) { spring->ij = MIN2(medge[i].v1, medge[i].v2); spring->kl = MAX2(medge[i].v2, medge[i].v1); - spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest); + spring->restlen = len_v3v3(cloth->verts[spring->kl].xrest, cloth->verts[spring->ij].xrest) * 0.8; clmd->sim_parms->avg_spring_len += spring->restlen; cloth->verts[spring->ij].avg_spring_len += spring->restlen; cloth->verts[spring->kl].avg_spring_len += spring->restlen; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs