[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52720] trunk/blender: Silent a bunch of gcc warnings (usually dummy, but noisy!).
Bastien Montagne
montagne29 at wanadoo.fr
Sun Dec 2 17:01:07 CET 2012
Revision: 52720
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52720
Author: mont29
Date: 2012-12-02 16:01:06 +0000 (Sun, 02 Dec 2012)
Log Message:
-----------
Silent a bunch of gcc warnings (usually dummy, but noisy!).
Modified Paths:
--------------
trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.cpp
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c
trunk/blender/source/blender/bmesh/operators/bmo_utils.c
trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/imbuf/intern/divers.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
Modified: trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.cpp 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.cpp 2012-12-02 16:01:06 UTC (rev 52720)
@@ -81,7 +81,7 @@
int samplesize = AUD_SAMPLE_SIZE(specs);
int size = length;
float factor = m_rate / m_reader->getSpecs().rate;
- float spos;
+ float spos = 0.0f;
sample_t low, high;
eos = false;
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-12-02 16:01:06 UTC (rev 52720)
@@ -3366,7 +3366,7 @@
(!hit_found || (brush->flags & MOD_DPAINT_INVERSE_PROX)))
{
float proxDist = -1.0f;
- float hitCo[3];
+ float hitCo[3] = {0.0f, 0.0f, 0.0f};
short hQuad;
int face;
@@ -3723,6 +3723,8 @@
float smooth_range = smooth * (1.0f - strength), dist;
/* calculate max range that can have particles with higher influence than the nearest one */
float max_range = smooth - strength * smooth + solidradius;
+ /* Make gcc happy! */
+ dist = max_range;
particles = BLI_kdtree_range_search(tree, max_range, bData->realCoord[bData->s_pos[index]].v, NULL, &nearest);
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-12-02 16:01:06 UTC (rev 52720)
@@ -189,7 +189,7 @@
#endif /* USE_TESSFACE_SPEEDUP */
else {
- ScanFillVert *sf_vert, *sf_vert_last = NULL, *sf_vert_first = NULL;
+ ScanFillVert *sf_vert = NULL, *sf_vert_last = NULL, *sf_vert_first = NULL;
/* ScanFillEdge *e; */ /* UNUSED */
ScanFillFace *sf_tri;
int totfilltri;
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-12-02 16:01:06 UTC (rev 52720)
@@ -2140,16 +2140,22 @@
precalc_guides(sim, sim->psys->effectors);
}
-static void integrate_particle(ParticleSettings *part, ParticleData *pa, float dtime, float *external_acceleration, void (*force_func)(void *forcedata, ParticleKey *state, float *force, float *impulse), void *forcedata)
+static void integrate_particle(ParticleSettings *part, ParticleData *pa, float dtime, float *external_acceleration,
+ void (*force_func)(void *forcedata, ParticleKey *state, float *force, float *impulse),
+ void *forcedata)
{
+#define ZERO_F43 {{0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 0.0f}}
+
ParticleKey states[5];
- float force[3],acceleration[3],impulse[3],dx[4][3],dv[4][3],oldpos[3];
+ float force[3], acceleration[3], impulse[3], dx[4][3] = ZERO_F43, dv[4][3] = ZERO_F43, oldpos[3];
float pa_mass= (part->flag & PART_SIZEMASS ? part->mass * pa->size : part->mass);
int i, steps=1;
int integrator = part->integrator;
+#undef ZERO_F43
+
copy_v3_v3(oldpos, pa->state.co);
-
+
/* Verlet integration behaves strangely with moving emitters, so do first step with euler. */
if (pa->prev_state.time < 0.f && integrator == PART_INT_VERLET)
integrator = PART_INT_EULER;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-12-02 16:01:06 UTC (rev 52720)
@@ -55,8 +55,8 @@
BMIter liter, liter2;
BMFace *f, *f2, *f3;
BMLoop *l, *l2, *l3, *l4, *l_tmp;
- BMEdge **edges = NULL, *e, *laste;
- BMVert *v, *lastv, *firstv;
+ BMEdge **edges = NULL, *e, *laste = NULL;
+ BMVert *v = NULL, *lastv, *firstv;
BLI_array_declare(edges);
int i;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c 2012-12-02 16:01:06 UTC (rev 52720)
@@ -178,6 +178,7 @@
plane_co[symm->axis][2],
&lambda, TRUE);
BLI_assert(r);
+ (void)r;
madd_v3_v3v3fl(co, e->v1->co, edge_dir, lambda);
co[symm->axis] = 0;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_utils.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-12-02 16:01:06 UTC (rev 52720)
@@ -494,10 +494,10 @@
BMO_ITER (fs, &fs_iter, op->slots_in, "faces", BM_FACE) {
if (CustomData_has_layer(&(bm->ldata), CD_MLOOPUV)) {
if (use_ccw == FALSE) { /* same loops direction */
- BMLoop *lf; /* current face loops */
- MLoopUV *f_luv; /* first face loop uv */
- float p_uv[2]; /* previous uvs */
- float t_uv[2]; /* tmp uvs */
+ BMLoop *lf; /* current face loops */
+ MLoopUV *f_luv = NULL; /* first face loop uv */
+ float p_uv[2] = {0.0f, 0.0f}; /* previous uvs */
+ float t_uv[2]; /* tmp uvs */
int n = 0;
BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) {
@@ -518,10 +518,10 @@
copy_v2_v2(f_luv->uv, p_uv);
}
else { /* counter loop direction */
- BMLoop *lf; /* current face loops */
- MLoopUV *p_luv; /* previous loop uv */
- MLoopUV *luv;
- float t_uv[2]; /* current uvs */
+ BMLoop *lf; /* current face loops */
+ MLoopUV *p_luv; /* previous loop uv */
+ MLoopUV *luv = NULL;
+ float t_uv[2] = {0.0f, 0.0f}; /* current uvs */
int n = 0;
BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) {
@@ -599,10 +599,10 @@
BMO_ITER (fs, &fs_iter, op->slots_in, "faces", BM_FACE) {
if (CustomData_has_layer(&(bm->ldata), CD_MLOOPCOL)) {
if (use_ccw == FALSE) { /* same loops direction */
- BMLoop *lf; /* current face loops */
- MLoopCol *f_lcol; /* first face loop color */
- MLoopCol p_col; /* previous color */
- MLoopCol t_col; /* tmp color */
+ BMLoop *lf; /* current face loops */
+ MLoopCol *f_lcol = NULL; /* first face loop color */
+ MLoopCol p_col; /* previous color */
+ MLoopCol t_col; /* tmp color */
int n = 0;
BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) {
@@ -623,10 +623,10 @@
*f_lcol = p_col;
}
else { /* counter loop direction */
- BMLoop *lf; /* current face loops */
- MLoopCol *p_lcol; /* previous loop color */
- MLoopCol *lcol;
- MLoopCol t_col; /* current color */
+ BMLoop *lf; /* current face loops */
+ MLoopCol *p_lcol; /* previous loop color */
+ MLoopCol *lcol = NULL;
+ MLoopCol t_col; /* current color */
int n = 0;
BM_ITER_ELEM (lf, &l_iter, fs, BM_LOOPS_OF_FACE) {
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2012-12-02 16:01:06 UTC (rev 52720)
@@ -381,6 +381,8 @@
int iret;
BLI_assert(f1 != NULL && f2 != NULL);
+ (void)f1;
+ (void)f2;
/* get direction vectors for two offset lines */
sub_v3_v3v3(dir1, v->co, BM_edge_other_vert(e1->e, v)->co);
@@ -879,6 +881,7 @@
ns = vm->seg;
ns2 = ns / 2;
BLI_assert(n > 2 && ns > 1);
+ (void)n;
/* Make initial rings, going between points on neighbors.
* After this loop, will have coords for all (i, r, k) where
* BoundVert for i has a bevel, 0 <= r <= ns2, 0 <= k <= ns */
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2012-12-02 16:01:06 UTC (rev 52720)
@@ -703,6 +703,7 @@
ok = BM_edge_loop_pair(e_clear, &l_a, &l_b);
BLI_assert(ok == TRUE);
+ (void)ok;
BLI_assert(l_a->f->len == 3);
BLI_assert(l_b->f->len == 3);
Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/collada/collada_utils.cpp 2012-12-02 16:01:06 UTC (rev 52720)
@@ -139,7 +139,7 @@
{
Mesh *tmpmesh;
CustomDataMask mask = CD_MASK_MESH;
- DerivedMesh *dm;
+ DerivedMesh *dm = NULL;
switch (export_mesh_type) {
case BC_MESH_TYPE_VIEW: {
dm = mesh_create_derived_view(scene, ob, mask);
@@ -151,7 +151,7 @@
}
}
- tmpmesh = BKE_mesh_add("ColladaMesh"); // name is not important here
+ tmpmesh = BKE_mesh_add("ColladaMesh"); // name is not important here
DM_to_mesh(dm, tmpmesh, ob);
dm->release(dm);
return tmpmesh;
Modified: trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp 2012-12-02 15:58:26 UTC (rev 52719)
+++ trunk/blender/source/blender/compositor/nodes/COM_ScaleNode.cpp 2012-12-02 16:01:06 UTC (rev 52720)
@@ -39,7 +39,7 @@
InputSocket *inputXSocket = this->getInputSocket(1);
InputSocket *inputYSocket = this->getInputSocket(2);
OutputSocket *outputSocket = this->getOutputSocket(0);
- BaseScaleOperation *scaleoperation;
+ BaseScaleOperation *scaleoperation = NULL;
bNode *bnode = this->getbNode();
switch (bnode->custom1) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list