Bugfix Cloth: Hooks were broken by recent changes.
authorDaniel Genrich <daniel.genrich@gmx.net>
Sun, 12 Aug 2012 22:54:35 +0000 (22:54 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Sun, 12 Aug 2012 22:54:35 +0000 (22:54 +0000)
This makes it looks like if part 1 of the Dynamic Paint regression blend file fails, but actually it's correct.

source/blender/blenkernel/intern/cloth.c

index af7afe7bf30836c328a77520c520ed89d6af50b4..b0de7a5ea6c88be004c1214bb0f908f242129ac9 100644 (file)
@@ -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);