[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34219] trunk/blender/source/blender: callback function ptcache_particle_extra_read() was incorrect type, also fix some other compiler warnings with recent commits.

[Campbell Barton]

Revision: 34219
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34219
Author:   campbellbarton
Date:     2011-01-10 05:17:53 +0000 (Mon, 10 Jan 2011)
Log Message:
-----------
callback function ptcache_particle_extra_read() was incorrect type, also fix some other compiler warnings with recent commits.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c
    trunk/blender/source/blender/blenkernel/intern/pointcache.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-01-10 03:58:07 UTC (rev 34218)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2011-01-10 05:17:53 UTC (rev 34219)
@@ -2415,7 +2415,7 @@
 	/*----------------------------------------------------------------*/	 	 
 }
 
-static void apply_fluid_springs(ParticleSystem *psys, ParticleSettings *part, float timestep){
+static void apply_fluid_springs(ParticleSystem *psys, float timestep){
 	SPHFluidSettings *fluid = psys->part->fluid;
 	ParticleData *pa1, *pa2;
 	ParticleSpring *spring = psys->fluid_springs;
@@ -3563,7 +3563,7 @@
 			}
 
 			/* Apply springs to particles */
-			apply_fluid_springs(psys, part, timestep);
+			apply_fluid_springs(psys, timestep);
 
 			/* apply velocity, collisions and rotation */
 			LOOP_DYNAMIC_PARTICLES {

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-01-10 03:58:07 UTC (rev 34218)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2011-01-10 05:17:53 UTC (rev 34219)
@@ -416,7 +416,7 @@
 	}
 }
 
-static int ptcache_particle_extra_read(void *psys_v, PTCacheMem *pm, float UNUSED(cfra))
+static void ptcache_particle_extra_read(void *psys_v, PTCacheMem *pm, float UNUSED(cfra))
 {
 	ParticleSystem *psys = psys_v;
 	PTCacheExtra *extra = pm->extradata.first;
@@ -434,7 +434,6 @@
 			}
 		}
 	}
-	return 1;
 }
 
 /* Cloth functions */

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-01-10 03:58:07 UTC (rev 34218)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-01-10 05:17:53 UTC (rev 34219)
@@ -2925,7 +2925,7 @@
 
 /* ************ READ PARTICLE SETTINGS ***************** */
 /* update this also to writefile.c */
-static char *ptcache_data_struct[] = {
+static const char *ptcache_data_struct[] = {
 	"", // BPHYS_DATA_INDEX
 	"", // BPHYS_DATA_LOCATION
 	"", // BPHYS_DATA_VELOCITY

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c	2011-01-10 03:58:07 UTC (rev 34218)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c	2011-01-10 05:17:53 UTC (rev 34219)
@@ -770,7 +770,7 @@
 }
 
 /* update this also to readfile.c */
-static char *ptcache_data_struct[] = {
+static const char *ptcache_data_struct[] = {
 	"", // BPHYS_DATA_INDEX
 	"", // BPHYS_DATA_LOCATION
 	"", // BPHYS_DATA_VELOCITY
@@ -780,7 +780,7 @@
 	"", // BPHYS_DATA_TIMES:	
 	"BoidData" // case BPHYS_DATA_BOIDS:
 };
-static char *ptcache_extra_struct[] = {
+static const char *ptcache_extra_struct[] = {
 	"",
 	"ParticleSpring"
 };