[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13281] trunk/blender/source/blender: Routine purge of compiler warnings

[Joshua Leung]

Revision: 13281
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13281
Author:   aligorith
Date:     2008-01-18 00:38:53 +0100 (Fri, 18 Jan 2008)

Log Message:
-----------
Routine purge of compiler warnings

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/modifier.c
    trunk/blender/source/blender/blenkernel/intern/particle.c
    trunk/blender/source/blender/src/buttons_object.c
    trunk/blender/source/blender/src/editparticle.c
    trunk/blender/source/blender/src/sculptmode.c
    trunk/blender/source/blender/src/view.c

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-01-17 23:03:37 UTC (rev 13280)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2008-01-17 23:38:53 UTC (rev 13281)
@@ -2724,9 +2724,9 @@
 {
 	DisplaceModifierData *dmd = (DisplaceModifierData*) md;
 
-	walk(userData, ob, &dmd->texture);
+	walk(userData, ob, (ID **)&dmd->texture);
 
-	displaceModifier_foreachObjectLink(md, ob, (ObjectWalkFunc) walk, userData);
+	displaceModifier_foreachObjectLink(md, ob, (ObjectWalkFunc)walk, userData);
 }
 
 static int displaceModifier_isDisabled(ModifierData *md)

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2008-01-17 23:03:37 UTC (rev 13280)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2008-01-17 23:38:53 UTC (rev 13281)
@@ -2240,7 +2240,7 @@
 	Material *ma;
 	
 	float birthtime = 0.0, dietime = 0.0;
-	float t, time, keytime, dfra = 1.0, frs_sec = G.scene->r.frs_sec;
+	float t, time = 0.0, keytime = 0.0, dfra = 1.0, frs_sec = G.scene->r.frs_sec;
 	float col[3] = {0.5f, 0.5f, 0.5f};
 	float prev_tangent[3], hairmat[4][4];
 	int k,i;
@@ -3235,13 +3235,13 @@
 	ParticleData *pa;
 	ChildParticle *cpa;
 	ParticleTexture ptex;
-	ParticleKey tstate, *kkey[2] = {NULL, NULL};
+	ParticleKey *kkey[2] = {NULL, NULL};
 	HairKey *hkey[2];
 	ParticleKey *par=0, keys[4];
 
 	float t, real_t, dfra, keytime, frs_sec = G.scene->r.frs_sec;
 	float co[3], orco[3];
-	float imat[4][4], hairmat[4][4], cpa_1st[3];
+	float hairmat[4][4];
 	float pa_clump = 0.0, pa_kink = 0.0;
 	int totparent = 0;
 	int totpart = psys->totpart;

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-01-17 23:03:37 UTC (rev 13280)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-01-17 23:38:53 UTC (rev 13281)
@@ -3373,7 +3373,7 @@
 	SoftBody *sb=ob->soft;
 	uiBlock *block;
 	static int val;
-	short *softflag=&ob->softflag, psys_cur=0,adaptive_mode;
+	short *softflag=&ob->softflag, psys_cur=0, adaptive_mode=0;
 	int ob_has_hair=psys_ob_has_hair(ob);
     if(!_can_softbodies_at_all(ob)) return;
 	/*bah that is ugly! creating missing data members in UI code*/

Modified: trunk/blender/source/blender/src/editparticle.c
===================================================================
--- trunk/blender/source/blender/src/editparticle.c	2008-01-17 23:03:37 UTC (rev 13280)
+++ trunk/blender/source/blender/src/editparticle.c	2008-01-17 23:38:53 UTC (rev 13281)
@@ -2015,7 +2015,7 @@
 void PE_radialcontrol_start(const int mode)
 {
 	ParticleEditSettings *pset = PE_settings();
-	int orig;
+	int orig= 1;
 
 	if(pset->brushtype>=0) {
 		ParticleBrushData *brush= &pset->brush[pset->brushtype];

Modified: trunk/blender/source/blender/src/sculptmode.c
===================================================================
--- trunk/blender/source/blender/src/sculptmode.c	2008-01-17 23:03:37 UTC (rev 13280)
+++ trunk/blender/source/blender/src/sculptmode.c	2008-01-17 23:38:53 UTC (rev 13281)
@@ -1281,7 +1281,7 @@
 	SculptData *sd = sculpt_data();
 	SculptSession *ss = sculpt_session();
 	BrushData *br = sculptmode_brush();
-	int orig, max;
+	int orig=1, max=100;
 
 	if(mode == RADIALCONTROL_SIZE) {
 		orig = br->size;

Modified: trunk/blender/source/blender/src/view.c
===================================================================
--- trunk/blender/source/blender/src/view.c	2008-01-17 23:03:37 UTC (rev 13280)
+++ trunk/blender/source/blender/src/view.c	2008-01-17 23:38:53 UTC (rev 13281)
@@ -88,6 +88,7 @@
 
 #include "mydevice.h"
 #include "blendef.h"
+#include "transform.h"
 
 #include "PIL_time.h" /* smoothview */