Cloth structure names update: Sorry about this commit, it will kill all your cloth settings in old files but I had to do it before release because naming convention was really bad in cloth (e.g. using SimulationSettings instead of ClothSimSettings in DNA). Same for some structure in CollisionModifier but with no sideeffects.

2 files changed, 10 insertions, 9 deletions

diff --git a/source/blender/makesdna/DNA_cloth_types.h b/source/blender/makesdna/DNA_cloth_types.h
index 4ba1f4f02e8..53fbd1ff72c 100644
--- a/source/blender/makesdna/DNA_cloth_types.h
+++ b/source/blender/makesdna/DNA_cloth_types.h
@@ -44,7 +44,8 @@
 * as in stepsPerFrame comapred to the time step in the paper, I've used
 * variables with different names to minimize confusion.
 **/
-typedef struct SimulationSettings
+
+typedef struct ClothSimSettings
 {
 	short	vgroup_mass;	/* optional vertexgroup name for assigning weight.*/
 	short	vgroup_struct;  /* vertex group for scaling structural stiffness */
@@ -87,10 +88,10 @@ typedef struct SimulationSettings
 	short pad;
 	int pad2;
 }
-SimulationSettings;
+ClothSimSettings;
 
 
-typedef struct CollisionSettings
+typedef struct ClothCollSettings
 {
 	float	epsilon;		/* min distance for collisions.		*/
 	float	self_friction;		/* Fiction/damping with self contact.		 	*/
@@ -101,7 +102,7 @@ typedef struct CollisionSettings
 	int	flags;			/* collision flags defined in BKE_cloth.h */
 	float 	selfepsilon; 		/* for selfcollision */
 }
-CollisionSettings;
+ClothCollSettings;
 
 
 /**
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index dd1d8eb01b3..c62d012643a 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -369,8 +369,8 @@ typedef struct ClothModifierData {
    ModifierData		modifier;
 
    struct Cloth *clothObject; /* The internal data structure for cloth. */
-   struct SimulationSettings *sim_parms; /* definition is in DNA_cloth_types.h */
-   struct CollisionSettings *coll_parms; /* definition is in DNA_cloth_types.h */
+   struct ClothSimSettings *sim_parms; /* definition is in DNA_cloth_types.h */
+   struct ClothCollSettings *coll_parms; /* definition is in DNA_cloth_types.h */
 } ClothModifierData;
 
 typedef struct CollisionModifierData {
@@ -381,15 +381,15 @@ typedef struct CollisionModifierData {
 	struct MVert *xold; /* unsued atm, but was discussed during sprint */
 	struct MVert *current_xnew; /* new position at the actual inter-frame step */
 	struct MVert *current_x; /* position at the actual inter-frame step */
-	struct MVert *current_v; /* position at the actual inter-frame step */
+	struct MVert *current_v; /* (xnew - x) at the actual inter-frame step */
 	
 	struct MFace *mfaces; /* object face data */
 	
 	unsigned int numverts;
 	unsigned int numfaces;
 	int pad;
-	float time;
-	struct BVH *tree;	/* collision tree for this cloth object */
+	float time;		/* cfra time of modifier */
+	struct BVH *bvh;	/* bounding volume hierarchy for this cloth object */
 } CollisionModifierData;
 
 typedef enum {