diff options
author | Joshua Leung <aligorith@gmail.com> | 2007-09-17 10:11:06 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2007-09-17 10:11:06 +0400 |
commit | 672a66905b0aca8a7099de3743d1e42059c4fc98 (patch) | |
tree | 1c2af82bce01b8f676ebf908a1ec710bb675dba8 | |
parent | a48f15e124ef441d5f644f49899e4939aa13dff3 (diff) |
Patch/Bugfix #7334 by 'gsr b3d:
Some more compiler warning fixes. Some of these seem to be specific to GCC 4.1
-rw-r--r-- | intern/elbeem/intern/attributes.cpp | 1 | ||||
-rw-r--r-- | intern/elbeem/intern/particletracer.cpp | 1 | ||||
-rw-r--r-- | source/blender/python/api2_2x/Mesh.c | 4 | ||||
-rw-r--r-- | source/blender/python/api2_2x/Noise.c | 2 | ||||
-rw-r--r-- | source/blender/python/api2_2x/Pose.c | 5 | ||||
-rw-r--r-- | source/blender/python/api2_2x/bpy_data.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/texture.c | 2 | ||||
-rw-r--r-- | source/blender/src/editmesh_mods.c | 2 | ||||
-rw-r--r-- | source/blender/src/editnla.c | 4 | ||||
-rw-r--r-- | source/blender/src/editscreen.c | 2 | ||||
-rw-r--r-- | source/blender/src/transform.c | 3 | ||||
-rw-r--r-- | source/blender/src/transform_generics.c | 2 |
12 files changed, 19 insertions, 11 deletions
diff --git a/intern/elbeem/intern/attributes.cpp b/intern/elbeem/intern/attributes.cpp index 890d6e75c9e..8e337a92a4e 100644 --- a/intern/elbeem/intern/attributes.cpp +++ b/intern/elbeem/intern/attributes.cpp @@ -103,6 +103,7 @@ void AttributeList::readMat4Gfx(string name, ntlMat4Gfx defaultValue, string sou // set that a parameter can be given, and will be ignored... bool AttributeList::ignoreParameter(string name, string source) { + name=source=(""); // remove warning return false; } diff --git a/intern/elbeem/intern/particletracer.cpp b/intern/elbeem/intern/particletracer.cpp index c537a893c27..c9da808543a 100644 --- a/intern/elbeem/intern/particletracer.cpp +++ b/intern/elbeem/intern/particletracer.cpp @@ -325,6 +325,7 @@ void ParticleTracer::getTriangles(double time, vector<ntlTriangle> *triangles, // suppress warnings... vertices = NULL; triangles = NULL; normals = NULL; objectId = 0; + time = 0.0; #else // ELBEEM_PLUGIN int pcnt = 0; // currently not used in blender diff --git a/source/blender/python/api2_2x/Mesh.c b/source/blender/python/api2_2x/Mesh.c index 6967b64da72..d2cc1edf3c3 100644 --- a/source/blender/python/api2_2x/Mesh.c +++ b/source/blender/python/api2_2x/Mesh.c @@ -1345,8 +1345,8 @@ static PyObject *Mesh_getProperty_internal(CustomData *data, int eindex, PyObjec static PyObject *Mesh_setProperty_internal(CustomData *data, int eindex, PyObject *args) { CustomDataLayer *layer; - int i,index, type = -1; - float f; + int i = 0, index, type = -1; + float f = 0.0f; char *s=NULL, *name=NULL; MFloatProperty *pf; MIntProperty *pi; diff --git a/source/blender/python/api2_2x/Noise.c b/source/blender/python/api2_2x/Noise.c index 5253ea810b0..c1a41d46714 100644 --- a/source/blender/python/api2_2x/Noise.c +++ b/source/blender/python/api2_2x/Noise.c @@ -199,7 +199,7 @@ static PyObject *Noise_random( PyObject * self ) static PyObject *Noise_randuvec( PyObject * self ) { - float v[3]; + float v[3] = {0.0f, 0.0f, 0.0f}; randuvec( v ); return Py_BuildValue( "[fff]", v[0], v[1], v[2] ); } diff --git a/source/blender/python/api2_2x/Pose.c b/source/blender/python/api2_2x/Pose.c index ed25c15c9f5..47ae96b2286 100644 --- a/source/blender/python/api2_2x/Pose.c +++ b/source/blender/python/api2_2x/Pose.c @@ -693,9 +693,12 @@ static int PoseBone_setLocalMatrix(BPy_PoseBone *self, PyObject *value, void *cl } //get loc - if (matsize == 4){ + if (matsize == 4) { VECCOPY(loc, matrix->matrix[3]); } + else { + loc[0]= loc[1]= loc[2]= 0.0f; + } //copy new attributes VECCOPY(self->posechannel->size, size); diff --git a/source/blender/python/api2_2x/bpy_data.c b/source/blender/python/api2_2x/bpy_data.c index b775c0a8236..edb894bd982 100644 --- a/source/blender/python/api2_2x/bpy_data.c +++ b/source/blender/python/api2_2x/bpy_data.c @@ -407,7 +407,7 @@ PyObject *LibBlockSeq_new(BPy_LibBlockSeq *self, PyObject * args, PyObject *kwd) static char *kwlist[] = {"name", "filename", NULL}; if(PyArg_ParseTupleAndKeywords(args, kwd, "|ss", kwlist, &name, &filename) && filename ) { - PyObject *ret; + PyObject *ret= NULL; if (strlen(filename) > FILE_MAXDIR + FILE_MAXFILE - 1) return ( EXPP_ReturnPyObjError( PyExc_IOError, diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 814309e9e31..8c366593034 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -1390,7 +1390,7 @@ void do_material_tex(ShadeInput *shi) TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL}; float *co = NULL, *dx = NULL, *dy = NULL; float fact, facm, factt, facmm, stencilTin=1.0; - float texvec[3], dxt[3], dyt[3], tempvec[3], norvec[3], warpvec[3], Tnor=1.0; + float texvec[3], dxt[3], dyt[3], tempvec[3], norvec[3], warpvec[3]={0.0f, 0.0f, 0.0f}, Tnor=1.0; int tex_nr, rgbnor= 0, warpdone=0; if (R.r.scemode & R_NO_TEX) return; diff --git a/source/blender/src/editmesh_mods.c b/source/blender/src/editmesh_mods.c index ffe4bc61764..c117fd514d7 100644 --- a/source/blender/src/editmesh_mods.c +++ b/source/blender/src/editmesh_mods.c @@ -1538,7 +1538,7 @@ void mesh_copy_menu(void) error("mesh has no color layers"); return; } else { - /* guess teh 4th color if needs be */ + /* guess the 4th color if needs be */ float val =- 1; if (!efa_act->v4) { diff --git a/source/blender/src/editnla.c b/source/blender/src/editnla.c index 2233db6e346..9115665afa0 100644 --- a/source/blender/src/editnla.c +++ b/source/blender/src/editnla.c @@ -980,7 +980,7 @@ void transform_nlachannel_keys(int mode, int dummy) bActionChannel *chan; bActionStrip *strip; bConstraintChannel *conchan; - float sval[2], cval[2], lastcval[2]; + float sval[2], cval[2], lastcval[2]= {0.0f, 0.0f}; float fac=0.0F; float deltax, startx; int i; @@ -1077,7 +1077,7 @@ void transform_nlachannel_keys(int mode, int dummy) for (chan=base->object->action->chanbase.first; chan; chan=chan->next){ if (EDITABLE_ACHAN(chan)) { tvtot=add_trans_ipo_keys(chan->ipo, tv, tvtot); - + /* Manipulate action constraint ipos */ if (EXPANDED_ACHAN(chan) && FILTER_CON_ACHAN(chan)) { for (conchan=chan->constraintChannels.first; conchan; conchan=conchan->next) { diff --git a/source/blender/src/editscreen.c b/source/blender/src/editscreen.c index b877915b1d6..9ae46998cbc 100644 --- a/source/blender/src/editscreen.c +++ b/source/blender/src/editscreen.c @@ -3074,7 +3074,7 @@ static void splitarea_interactive(ScrArea *area, ScrEdge *onedge) ScrArea *scr, *sa= area; float fac= 0.0; unsigned short event; - short ok= 0, val, split = 0, mval[2], mvalo[2], first= 1; + short ok= 0, val, split = 0, mval[2], mvalo[2]= {-1, -1}, first= 1; char dir; if(sa->win==0) return; diff --git a/source/blender/src/transform.c b/source/blender/src/transform.c index b3814831ddf..e8512d08d04 100644 --- a/source/blender/src/transform.c +++ b/source/blender/src/transform.c @@ -1972,6 +1972,9 @@ static void applyRotation(TransInfo *t, float angle, float axis[3]) if (t->around == V3D_LOCAL) { VECCOPY(center, t->center); } + else { + center[0] = center[1] = center[2] = 0.0f; + } VecRotToMat3(axis, angle, mat); diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c index 8e92fdda38a..357623ea494 100644 --- a/source/blender/src/transform_generics.c +++ b/source/blender/src/transform_generics.c @@ -139,7 +139,7 @@ void getViewVector(float coord[3], float vec[3]) static void clipMirrorModifier(TransInfo *t, Object *ob) { ModifierData *md= ob->modifiers.first; - float tolerance[3]; + float tolerance[3] = {0.0f, 0.0f, 0.0f}; int axis = 0; for (; md; md=md->next) { |