[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52733] trunk/blender/source/blender: revert part of r52720, Id rather leave these as-is, even if they give warnings under some configurations.
Campbell Barton
ideasman42 at gmail.com
Mon Dec 3 09:11:13 CET 2012
Revision: 52733
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52733
Author: campbellbarton
Date: 2012-12-03 08:11:04 +0000 (Mon, 03 Dec 2012)
Log Message:
-----------
revert part of r52720, Id rather leave these as-is, even if they give warnings under some configurations.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52720
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.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/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-12-03 07:10:31 UTC (rev 52732)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-12-03 08:11:04 UTC (rev 52733)
@@ -189,7 +189,7 @@
#endif /* USE_TESSFACE_SPEEDUP */
else {
- ScanFillVert *sf_vert = NULL, *sf_vert_last = NULL, *sf_vert_first = NULL;
+ ScanFillVert *sf_vert, *sf_vert_last = NULL, *sf_vert_first = NULL;
/* ScanFillEdge *e; */ /* UNUSED */
ScanFillFace *sf_tri;
int totfilltri;
Modified: trunk/blender/source/blender/bmesh/operators/bmo_extrude.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-12-03 07:10:31 UTC (rev 52732)
+++ trunk/blender/source/blender/bmesh/operators/bmo_extrude.c 2012-12-03 08:11:04 UTC (rev 52733)
@@ -55,8 +55,8 @@
BMIter liter, liter2;
BMFace *f, *f2, *f3;
BMLoop *l, *l2, *l3, *l4, *l_tmp;
- BMEdge **edges = NULL, *e, *laste = NULL;
- BMVert *v = NULL, *lastv, *firstv;
+ BMEdge **edges = NULL, *e, *laste;
+ BMVert *v, *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-03 07:10:31 UTC (rev 52732)
+++ trunk/blender/source/blender/bmesh/operators/bmo_symmetrize.c 2012-12-03 08:11:04 UTC (rev 52733)
@@ -178,7 +178,6 @@
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-03 07:10:31 UTC (rev 52732)
+++ trunk/blender/source/blender/bmesh/operators/bmo_utils.c 2012-12-03 08:11:04 UTC (rev 52733)
@@ -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 = NULL; /* first face loop uv */
- float p_uv[2] = {0.0f, 0.0f}; /* previous uvs */
- float t_uv[2]; /* tmp uvs */
+ BMLoop *lf; /* current face loops */
+ MLoopUV *f_luv; /* first face loop uv */
+ float p_uv[2]; /* 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 = NULL;
- float t_uv[2] = {0.0f, 0.0f}; /* current uvs */
+ BMLoop *lf; /* current face loops */
+ MLoopUV *p_luv; /* previous loop uv */
+ MLoopUV *luv;
+ float t_uv[2]; /* 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 = NULL; /* first face loop color */
- MLoopCol p_col; /* previous color */
- MLoopCol t_col; /* tmp color */
+ BMLoop *lf; /* current face loops */
+ MLoopCol *f_lcol; /* 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 = NULL;
- MLoopCol t_col; /* current color */
+ BMLoop *lf; /* current face loops */
+ MLoopCol *p_lcol; /* previous loop color */
+ MLoopCol *lcol;
+ 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-03 07:10:31 UTC (rev 52732)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_bevel.c 2012-12-03 08:11:04 UTC (rev 52733)
@@ -381,8 +381,6 @@
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);
@@ -854,7 +852,6 @@
ns = vm->seg;
ns2 = ns / 2;
BLI_assert(n > 2 && ns > 1);
- (void)n;
/* special case: two beveled edges are in line and share a face, making a "pipe" */
epipe = NULL;
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2012-12-03 07:10:31 UTC (rev 52732)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_collapse.c 2012-12-03 08:11:04 UTC (rev 52733)
@@ -703,7 +703,6 @@
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/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-12-03 07:10:31 UTC (rev 52732)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2012-12-03 08:11:04 UTC (rev 52733)
@@ -2367,8 +2367,8 @@
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
- UvElementMap *elementmap = NULL;
- char *island_enabled = NULL;
+ UvElementMap *elementmap;
+ char *island_enabled;
int count = 0, countsel = 0, count_rejected = 0;
int propmode = t->flag & T_PROP_EDIT;
int propconnected = t->flag & T_PROP_CONNECTED;
More information about the Bf-blender-cvs
mailing list