diff options
author | Joshua Leung <aligorith@gmail.com> | 2008-01-18 02:38:53 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2008-01-18 02:38:53 +0300 |
commit | 0db1666b6e178d9d4fe948f591666c5d094a8213 (patch) | |
tree | af9782341790592d3ee86673588c288b3e4e08c3 /source | |
parent | 44c31bb04523799bf918bb4e519c0ebad4c0b9b1 (diff) |
Routine purge of compiler warnings
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle.c | 6 | ||||
-rw-r--r-- | source/blender/src/buttons_object.c | 2 | ||||
-rw-r--r-- | source/blender/src/editparticle.c | 2 | ||||
-rw-r--r-- | source/blender/src/sculptmode.c | 2 | ||||
-rw-r--r-- | source/blender/src/view.c | 1 |
6 files changed, 9 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index faaeeacbc5e..1008abb3da0 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -2724,9 +2724,9 @@ static void displaceModifier_foreachIDLink(ModifierData *md, Object *ob, { 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) diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 9a429b0be6e..bf8d1e9d8aa 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -2240,7 +2240,7 @@ void psys_cache_paths(Object *ob, ParticleSystem *psys, float cfra, int editupda 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 @@ void psys_get_particle_on_path(Object *ob, ParticleSystem *psys, int p, Particle 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; diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 5443aa1de5e..8198c51550b 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -3373,7 +3373,7 @@ static void object_softbodies_II(Object *ob) 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*/ diff --git a/source/blender/src/editparticle.c b/source/blender/src/editparticle.c index ea93ba7a090..d70b8620ae8 100644 --- a/source/blender/src/editparticle.c +++ b/source/blender/src/editparticle.c @@ -2015,7 +2015,7 @@ RadialControl **PE_radialcontrol() 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]; diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c index 79a40fdb607..55626be8cfa 100644 --- a/source/blender/src/sculptmode.c +++ b/source/blender/src/sculptmode.c @@ -1281,7 +1281,7 @@ void sculpt_radialcontrol_start(int mode) 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; diff --git a/source/blender/src/view.c b/source/blender/src/view.c index 655fa59a4c1..a4960b76ae7 100644 --- a/source/blender/src/view.c +++ b/source/blender/src/view.c @@ -88,6 +88,7 @@ #include "mydevice.h" #include "blendef.h" +#include "transform.h" #include "PIL_time.h" /* smoothview */ |