2.5

Monthly cleaning round to make it compile warning free.
Mostly it was const stuff (strings, Context), but also
a couple useful fixes, like wrong use of temp pointers.

Only Mathutils callback struct I left alone... design issue.

1 files changed, 6 insertions, 3 deletions

diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c
index 08caea565aa..089dafeb8c7 100644
--- a/source/blender/blenkernel/intern/cloth.c
+++ b/source/blender/blenkernel/intern/cloth.c
@@ -341,24 +341,27 @@ void bvhselftree_update_from_cloth(ClothModifierData *clmd, int moving)
 }
 
 int modifiers_indexInObject(Object *ob, ModifierData *md_seek);
-static void cloth_write_state(int index, Cloth *cloth, float *data)
+static void cloth_write_state(int index, void *cloth_v, float *data)
 {
+	Cloth *cloth= cloth_v;
 	ClothVertex *vert = cloth->verts + index;
 
 	memcpy(data, vert->x, 3 * sizeof(float));
 	memcpy(data + 3, vert->xconst, 3 * sizeof(float));
 	memcpy(data + 6, vert->v, 3 * sizeof(float));
 }
-static void cloth_read_state(int index, Cloth *cloth, float *data)
+static void cloth_read_state(int index, void *cloth_v, float *data)
 {
+	Cloth *cloth= cloth_v;
 	ClothVertex *vert = cloth->verts + index;
 	
 	memcpy(vert->x, data, 3 * sizeof(float));
 	memcpy(vert->xconst, data + 3, 3 * sizeof(float));
 	memcpy(vert->v, data + 6, 3 * sizeof(float));
 }
-static void cloth_cache_interpolate(int index, Cloth *cloth, float frs_sec, float cfra, float cfra1, float cfra2, float *data1, float *data2)
+static void cloth_cache_interpolate(int index, void *cloth_v, float frs_sec, float cfra, float cfra1, float cfra2, float *data1, float *data2)
 {
+	Cloth *cloth= cloth_v;
 	ClothVertex *vert = cloth->verts + index;
 	ParticleKey keys[4];
 	float dfra;