update to trunk r14199ndof

5 files changed, 19 insertions, 13 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 {
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index f74e858c0e4..eda37d952c1 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -162,7 +162,8 @@ typedef struct bNodeTree {
 	
 	ListBase nodes, links;
 	
-	bNodeStack **stack;				/* stack is only while executing, no read/write in file */
+	bNodeStack *stack;				/* stack is only while executing, no read/write in file */
+	struct ListBase *threadstack;	/* same as above */
 	
 	int type, init;					/* set init on fileread */
 	int stacksize;					/* amount of elements in stack */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 869f1cb426d..f31f9fff142 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -468,6 +468,10 @@ typedef struct SculptData
 
 	/* Settings for each brush */
 	BrushData drawbrush, smoothbrush, pinchbrush, inflatebrush, grabbrush, layerbrush, flattenbrush;
+
+	/* For rotating around a pivot point */
+	float pivot[3];
+
 	short brush_type;
 
 	/* For the Brush Shape */
@@ -486,10 +490,10 @@ typedef struct SculptData
 	/* Symmetry is separate from the other BrushData because the same
 	   settings are always used for all brush types */
 	char symm;
-	
+
 	/* Added to store if the 'Rake' setting has been set */
 	char rake;
-	char pad[7];
+	char pad[3];
 } SculptData;
 
 typedef struct Scene {
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index 180cbd2af37..df9ea872caa 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -103,7 +103,7 @@ typedef struct View3D {
 	
 	/**
 	 * The drawing mode for the 3d display. Set to OB_WIRE, OB_SOLID,
-	 * OB_SHADED or OB_TEXTURED */
+	 * OB_SHADED or OB_TEXTURE */
 	short drawtype;
 	short localview;
 	int lay, layact;