Routine purge of compiler warnings
authorJoshua Leung <aligorith@gmail.com>
Thu, 17 Jan 2008 23:38:53 +0000 (23:38 +0000)
committerJoshua Leung <aligorith@gmail.com>
Thu, 17 Jan 2008 23:38:53 +0000 (23:38 +0000)
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle.c
source/blender/src/buttons_object.c
source/blender/src/editparticle.c
source/blender/src/sculptmode.c
source/blender/src/view.c

index faaeeacbc5ed21f078354ac817f33cc296fc7079..1008abb3da07479a93e9060f84f6a72a8b94e529 100644 (file)
@@ -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)
index 9a429b0be6e5d7ddb9d8e889e50bf74021076666..bf8d1e9d8aa949ab34bc5621f9a6fd9aacc03af4 100644 (file)
@@ -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;
index 5443aa1de5e314de8750a9c92063c590c3a23482..8198c51550b66e7ced60a553b09b3225321688f8 100644 (file)
@@ -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*/
index ea93ba7a090bf1470617ec6367facfc6003e2578..d70b8620ae8e5db292f03d9e2f9f789fb3d1496a 100644 (file)
@@ -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];
index 79a40fdb60700168ff1eaf6a687e4d460fdbdc83..55626be8cfa25576bdd43b4d8e1a6fa1d5dfa0ac 100644 (file)
@@ -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;
index 655fa59a4c1cda89412b8334e3ce0250984d733f..a4960b76ae76a705afdc7ab30ec9645cb124d571 100644 (file)
@@ -88,6 +88,7 @@
 
 #include "mydevice.h"
 #include "blendef.h"
+#include "transform.h"
 
 #include "PIL_time.h" /* smoothview */