[Bf-blender-cvs] [7002d8d] temp_merge_gooseberry_hair: Use identity transform in the solver data roots to avoid possible errors when this data is used outside the transform functions.

[Lukas Tönne]

Commit: 7002d8d163025a601b473b02ff3d7917fe21669d
Author: Lukas Tönne
Date:   Fri Sep 12 12:28:56 2014 +0200
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB7002d8d163025a601b473b02ff3d7917fe21669d

Use identity transform in the solver data roots to avoid possible errors
when this data is used outside the transform functions.

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

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

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

diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c
index e8b78bd..e9ceac5 100644
--- a/source/blender/blenkernel/intern/implicit.c
+++ b/source/blender/blenkernel/intern/implicit.c
@@ -2644,8 +2644,14 @@ void implicit_set_positions(ClothModifierData *clmd)
 	Implicit_Data *id = cloth->implicit;
 	
 	for (i = 0; i < numverts; i++) {
+#ifdef CLOTH_ROOT_FRAME
 		copy_v3_v3(id->root[i].loc, cloth_roots[i].loc);
 		copy_m3_m3(id->root[i].rot, cloth_roots[i].rot);
+#else
+		zero_v3(id->root[i].loc);
+		unit_m3(id->root[i].rot);
+		(void)cloth_roots;
+#endif
 		
 		loc_world_to_root(id->X[i], verts[i].x, &id->root[i]);
 		vel_world_to_root(id->V[i], id->X[i], verts[i].v, &id->root[i]);