diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-10-29 08:59:26 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-10-29 08:59:26 +0300 |
commit | e448f20db5e3d283f25898d07f64200f1acb8b3f (patch) | |
tree | 5951a94e237f659d9903c44d949572b6742b2690 /source/blender/blenkernel/intern | |
parent | 2c5287df0442f1c9cb1a9f234edcc56496229faf (diff) |
Routine purge of compiler warnings. Yet again, they were mostly uninitialised vars.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index bdf081496e5..d4b53e43b65 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -892,7 +892,7 @@ void BKE_stamp_buf(unsigned char *rect, float *rectf, int width, int height) { struct StampData stamp_data; - int x,y; + int x=1,y=1; int font_height; int text_width; int text_pad; diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index c62f59106a3..19dcee676cb 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1547,7 +1547,7 @@ int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], float * float force[3], unsigned int par_layer,struct Object *vertexowner, float time,float vel[3], float *intrusion) { - Object *ob; + Object *ob= NULL; GHash *hash; GHashIterator *ihash; float nv1[3], nv2[3], nv3[3], nv4[3], edge1[3], edge2[3],d_nvect[3], dv1[3],ve[3],avel[3], @@ -1555,7 +1555,7 @@ int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], float * outerforceaccu[3],innerforceaccu[3], facedist,n_mag,force_mag_norm,minx,miny,minz,maxx,maxy,maxz, innerfacethickness = -0.5f, outerfacethickness = 0.2f, - ee = 5.0f, ff = 0.1f, fa; + ee = 5.0f, ff = 0.1f, fa=1; int a, deflected=0, cavel=0,ci=0; /* init */ *intrusion = 0.0f; |