[Bf-blender-cvs] [f3be91c] hair_immediate_fixes: Don't try to enforce a velocity change for pinned vertices; their velocity is defined externally by hair root motion.

Lukas Tönne noreply at git.blender.org
Fri Sep 5 12:50:44 CEST 2014


Commit: f3be91c2d8f4a490d440d66f87e3bc6654a839c7
Author: Lukas Tönne
Date:   Thu Sep 4 19:58:17 2014 +0200
Branches: hair_immediate_fixes
https://developer.blender.org/rBf3be91c2d8f4a490d440d66f87e3bc6654a839c7

Don't try to enforce a velocity change for pinned vertices; their
velocity is defined externally by hair root motion.

===================================================================

M	source/blender/blenkernel/intern/implicit.c

===================================================================

diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index 6a27493..ae85579 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -1962,18 +1962,15 @@ static void setup_constraint_matrix(ClothModifierData *clmd, ColliderContacts *c
 	int numverts = clmd->clothObject->numverts;
 	int i, j, v;
 
-	/* Clear matrix from old vertex constraints */
-	for (v = 0; v < S[0].vcount; v++)
-		S[v].c = S[v].r = 0;
-
-	/* pinned vertex constraints */
 	for (v = 0; v < numverts; v++) {
 		S[v].c = S[v].r = v;
 		if (verts[v].flags & CLOTH_VERT_FLAG_PINNED) {
-			negate_v3_v3(z[v], verts[v].v);
+			/* pinned vertex constraints */
+			zero_v3(z[v]); /* velocity is defined externally */
 			zero_m3(S[v].m);
 		}
 		else {
+			/* free vertex */
 			zero_v3(z[v]);
 			unit_m3(S[v].m);
 		}




More information about the Bf-blender-cvs mailing list