diff options
author | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-10-21 21:56:26 +0400 |
---|---|---|
committer | Guillermo S. Romero <gsr.b3d@infernal-iceberg.com> | 2009-10-21 21:56:26 +0400 |
commit | 5fb73d8b81fbd1823a6c807714d6b3589e918a3b (patch) | |
tree | 4fc89128e6684313da52ad76e4b43b4bb0c62950 | |
parent | eab11543f3c411940744ab2f447a5c222d5a50dd (diff) |
Make compiler happy, remove doubtful non init usage.
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_loop.c | 4 | ||||
-rw-r--r-- | source/blender/editors/physics/particle_edit.c | 4 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_python.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap.c | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/CMP_util.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/intern/TEX_nodes/TEX_output.c | 2 | ||||
-rw-r--r-- | source/blender/python/generic/vector.c | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/volume_precache.c | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 2ce877bd847..c0391bb5406 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -1922,7 +1922,7 @@ void makeBevelList(Object *ob) BevPoint *bevp, *bevp2, *bevp1 = NULL, *bevp0; float min, inp, x1, x2, y1, y2; struct bevelsort *sortdata, *sd, *sd1; - int a, b, nr, poly, resolu, len=0; + int a, b, nr, poly, resolu = 0, len = 0; int do_tilt, do_radius; /* this function needs an object, because of tflag and upflag */ diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 089f2a5ebfb..a17b4b0be68 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -1705,7 +1705,7 @@ static int sb_detect_vertex_collisionCached(float opco[3], float facenormal[3], 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]={0.0,0.0,0.0}, - vv1[3], vv2[3], vv3[3], vv4[3], coledge[3], mindistedge = 1000.0f, + vv1[3], vv2[3], vv3[3], vv4[3], coledge[3]={0.0f, 0.0f, 0.0f}, mindistedge = 1000.0f, outerforceaccu[3],innerforceaccu[3], facedist,n_mag,force_mag_norm,minx,miny,minz,maxx,maxy,maxz, innerfacethickness = -0.5f, outerfacethickness = 0.2f, diff --git a/source/blender/editors/mesh/editmesh_loop.c b/source/blender/editors/mesh/editmesh_loop.c index 28103828dd4..3dc9c81a213 100644 --- a/source/blender/editors/mesh/editmesh_loop.c +++ b/source/blender/editors/mesh/editmesh_loop.c @@ -207,7 +207,7 @@ void CutEdgeloop(Object *obedit, wmOperator *op, EditMesh *em, int numcuts) EditEdge *nearest=NULL, *eed; float fac; int keys = 0, holdnum=0, selectmode, dist; - short mvalo[2] = {0,0}, mval[2]; + short mvalo[2] = {0, 0}, mval[2] = {0, 0}; short event=0, val, choosing=1, cancel=0, cuthalf = 0, smooth=0; short hasHidden = 0; char msg[128]; @@ -251,7 +251,7 @@ void CutEdgeloop(Object *obedit, wmOperator *op, EditMesh *em, int numcuts) // } #endif } - else PIL_sleep_ms(10); // idle + else PIL_sleep_ms(10); // idle while(qtest()) diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 9875051e1ad..ee1a21db7e5 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -2795,7 +2795,7 @@ static void brush_length(PEData *data, int point_index) PTCacheEdit *edit= data->edit; PTCacheEditPoint *point = edit->points + point_index; KEY_K; - float dvec[3],pvec[3]; + float dvec[3],pvec[3] = {0.0f, 0.0f, 0.0f}; LOOP_KEYS { if(k==0) { @@ -2819,7 +2819,7 @@ static void brush_puff(PEData *data, int point_index) PTCacheEditPoint *point = edit->points + point_index; KEY_K; float mat[4][4], imat[4][4]; - float lastco[3], rootco[3], co[3], nor[3], kco[3], dco[3], fac=0.0f, length=0.0f; + float lastco[3], rootco[3] = {0.0f, 0.0f, 0.0f}, co[3], nor[3], kco[3], dco[3], fac=0.0f, length=0.0f; if(psys && !(psys->flag & PSYS_GLOBAL_HAIR)) { psys_mat_hair_to_global(data->ob, data->dm, psys->part->from, psys->particles + point_index, mat); diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 5dd69cdf030..4f38e1e0c84 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -860,7 +860,7 @@ void sample_wpaint(Scene *scene, ARegion *ar, View3D *v3d, int mode) Object *ob= OBACT; Mesh *me= get_mesh(ob); int index; - short mval[2], sco[2]; + short mval[2] = {0, 0}, sco[2]; if (!me) return; diff --git a/source/blender/editors/space_text/text_python.c b/source/blender/editors/space_text/text_python.c index 4400747a731..92a64720210 100644 --- a/source/blender/editors/space_text/text_python.c +++ b/source/blender/editors/space_text/text_python.c @@ -50,7 +50,7 @@ int text_do_suggest_select(SpaceText *st, ARegion *ar) TextLine *tmp; int l, x, y, w, h, i; int tgti, *top; - short mval[2]; + short mval[2] = {0, 0}; if(!st || !st->text) return 0; if(!texttool_text_is_active(st->text)) return 0; diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 921ee2deaa4..51f257da432 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -94,7 +94,7 @@ static void view3d_boxview_clip(ScrArea *sa) ARegion *ar; BoundBox *bb = MEM_callocN(sizeof(BoundBox), "clipbb"); float clip[6][4]; - float x1= 0.0f, y1= 0.0f, z1= 0.0f, ofs[3]; + float x1= 0.0f, y1= 0.0f, z1= 0.0f, ofs[3] = {0.0f, 0.0f, 0.0f}; int val; /* create bounding box */ diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 37cd94c21c5..1d26649fea2 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -633,7 +633,7 @@ void CalcSnapGeometry(TransInfo *t, float *vec) DepthPeel *p1, *p2; float *last_p = NULL; float dist = FLT_MAX; - float p[3]; + float p[3] = {0.0f, 0.0f, 0.0f}; depth_peels.first = depth_peels.last = NULL; diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 2563f7977cc..9e164f46e4c 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -1168,7 +1168,7 @@ void GPU_color4_upload( DerivedMesh *dm, unsigned char *data ) void GPU_color_switch( int mode ) { if( mode ) { - if( !GLStates & GPU_BUFFER_COLOR_STATE ) + if( !(GLStates & GPU_BUFFER_COLOR_STATE) ) glEnableClientState( GL_COLOR_ARRAY ); GLStates |= GPU_BUFFER_COLOR_STATE; } diff --git a/source/blender/nodes/intern/CMP_util.c b/source/blender/nodes/intern/CMP_util.c index 175a0a54371..eb32436bf2c 100644 --- a/source/blender/nodes/intern/CMP_util.c +++ b/source/blender/nodes/intern/CMP_util.c @@ -1255,7 +1255,7 @@ CompBuf* qd_downScaledCopy(CompBuf* src, int scale) fbuf = alloc_compbuf(nw, nh, src->type, 1); { int x, y, xx, yy, sx, sy, mx, my; - float colsum[4]; + float colsum[4] = {0.0f, 0.0f, 0.0f, 0.0f}; float fscale = 1.f/(float)(scale*scale); for (y=0; y<nh; y++) { fRGB* fcolp = (fRGB*)&fbuf->rect[y*fbuf->x*fbuf->type]; diff --git a/source/blender/nodes/intern/TEX_nodes/TEX_output.c b/source/blender/nodes/intern/TEX_nodes/TEX_output.c index 580b4cde8bf..ab8920e67ad 100644 --- a/source/blender/nodes/intern/TEX_nodes/TEX_output.c +++ b/source/blender/nodes/intern/TEX_nodes/TEX_output.c @@ -118,7 +118,7 @@ static void unique_name(bNode *node) { TexNodeOutput *tno = (TexNodeOutput *)node->storage; char *new_name = 0; - int new_len; + int new_len = 0; int suffix; bNode *i; char *name = tno->name; diff --git a/source/blender/python/generic/vector.c b/source/blender/python/generic/vector.c index 605f45be128..0ce7b83e653 100644 --- a/source/blender/python/generic/vector.c +++ b/source/blender/python/generic/vector.c @@ -1271,7 +1271,7 @@ static PyObject *Vector_getSwizzle(VectorObject * self, void *closure) unchanged. */ static int Vector_setSwizzle(VectorObject * self, PyObject * value, void *closure) { - VectorObject *vecVal; + VectorObject *vecVal = NULL; PyObject *item; size_t listLen; float scalarVal; diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index fb83ae3f205..a60de529e8f 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1590,7 +1590,7 @@ static int foreach_compat_buffer(RawPropertyType raw_type, int attr_signed, cons static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set) { - PyObject *item; + PyObject *item = NULL; int i=0, ok, buffer_is_compat; void *array= NULL; @@ -2677,7 +2677,7 @@ PyObject *BPY_rna_props( void ) static StructRNA *pyrna_struct_as_srna(PyObject *self) { - BPy_StructRNA *py_srna; + BPy_StructRNA *py_srna = NULL; StructRNA *srna; /* ack, PyObject_GetAttrString wont look up this types tp_dict first :/ */ diff --git a/source/blender/render/intern/source/volume_precache.c b/source/blender/render/intern/source/volume_precache.c index 62d7343036a..25645d9cce2 100644 --- a/source/blender/render/intern/source/volume_precache.c +++ b/source/blender/render/intern/source/volume_precache.c @@ -594,7 +594,7 @@ void vol_precache_objectinstance_threads(Render *re, ObjectInstanceRen *obi, Mat ShadeInput shi; ListBase threads; float *bbmin=obi->obr->boundbox[0], *bbmax=obi->obr->boundbox[1]; - int parts[3], totparts; + int parts[3] = {1, 1, 1}, totparts; int caching=1, counter=0; int totthread = re->r.threads; |