-= Cloth cleanup =-

Fixes:
- Cloth event refactor to solve 2 unknown cache bugs
- Cloth vgroup refactor (faster + scalable stinnes now working)
- Cloth + Collision modifier on one object crash
- Editmode + faceextrude on baked cloth crash
- Stiffness groups would get pinned
- Correct scaled stiffness calculation
- Fixes freeing error under some circumstances
- Deactivating reset/cache freeing when in editmode
- Autobaking setting doesn't get screwed up anymore
- More than 1 collision object in a scene could explode
- Pinning + not protected cache didn't reset cloth
- Start simulation on first frame and not on 2nd
- Maximum structstiff now correct (copy-paste error)
- Loading file with baked cloth calculate the spring length correctly 
- Loading file behaviour improved with cache
- Collision object is evaluated first (untested)
- Debug output activated with rt>0

Be carefull: Files with some cloth cache or something should be 
regenerated.

1 files changed, 5 insertions, 8 deletions

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 475009c8fa6..7f378f136b6 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -4987,7 +4987,6 @@ static void clothModifier_updateDepgraph(
 	
 	Base *base;
 	
-	/* TODO: this belongs to collision modifier */
 	if(clmd)
 	{
 		for(base = G.scene->base.first; base; base= base->next) 
@@ -4995,14 +4994,11 @@ static void clothModifier_updateDepgraph(
 			Object *ob1= base->object;
 			if(ob1 != ob)
 			{
-				ClothModifierData *coll_clmd = (ClothModifierData *)modifiers_findByType(ob1, eModifierType_Cloth);
+				CollisionModifierData *coll_clmd = (CollisionModifierData *)modifiers_findByType(ob1, eModifierType_Collision);
 				if(coll_clmd)
-				{					
-					if (coll_clmd->sim_parms->flags & CLOTH_SIMSETTINGS_FLAG_COLLOBJ) 
-					{
-						DagNode *curNode = dag_get_node(forest, ob1);					
-						dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA);
-					}
+				{
+					DagNode *curNode = dag_get_node(forest, ob1);
+					dag_add_relation(forest, curNode, obNode, DAG_RL_DATA_DATA|DAG_RL_OB_DATA);
 				}
 			}
 		}
@@ -5220,6 +5216,7 @@ static void collisionModifier_deformVerts(
 		dm->release(dm);
 }
 
+
 /* Boolean */
 
 static void booleanModifier_copyData(ModifierData *md, ModifierData *target)