diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-13 02:54:35 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-13 02:54:35 +0400 |
| commit | e297e6b64b61ace14c4010972d5164a816a5c3f0 (patch) | |
| tree | b23a07a3b93ff3feb19700b5c791062291884d61 /source/blender/blenkernel/intern/cloth.c | |
| parent | 10f631094c158ff2fdb49fc9236e699fb91ed015 (diff) | |
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.
Diffstat (limited to 'source/blender/blenkernel/intern/cloth.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index af7afe7bf30..b0de7a5ea6c 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -400,18 +400,8 @@ static int do_step_cloth(Object *ob, ClothModifierData *clmd, DerivedMesh *resul 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); |