Revision: 41362
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41362
Author: campbellbarton
Date: 2011-10-29 11:23:37 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
style edits
- rename var to match trunk shape key code
- reduce scope of some vars
- comment some unused vars
Modified Paths:
--------------
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_interp.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -573,15 +573,14 @@
l2 = bm_firstfaceloop(source);
do {
double x2, y2;
- int ix2, iy2;
MDisps *md1, *md2;
md1 = CustomData_bmesh_get(&bm->ldata,
target->head.data, CD_MDISPS);
md2 = CustomData_bmesh_get(&bm->ldata,
l2->head.data, CD_MDISPS);
if (mdisp_in_mdispquad(bm, target, l2, co, &x2,
&y2, res)) {
- ix2 = (int)x2;
- iy2 = (int)y2;
+ int ix2 = (int)x2;
+ int iy2 = (int)y2;
old_mdisps_bilinear(md1->disps[iy*res+ix], md2->disps, res, (float)x2,
(float)y2);
}
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mods.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -79,8 +79,7 @@
int BM_Dissolve_Disk(BMesh *bm, BMVert *v) {
BMFace *f, *f2;
BMEdge *e, *keepedge=NULL, *baseedge=NULL;
- BMLoop *loop;
- int done, len= 0;
+ int len= 0;
if(BM_Nonmanifold_Vert(bm, v)) {
return 0;
@@ -105,7 +104,7 @@
if (keepedge == NULL && len == 3) {
/*handle specific case for three-valence. solve it by
increasing valence to four. this may be hackish. . .*/
- loop = e->l;
+ BMLoop *loop= e->l;
if (loop->v == v) loop = loop->next;
if (!BM_Split_Face(bm, loop->f, v, loop->v, NULL, NULL))
return 0;
@@ -133,7 +132,8 @@
}
if(keepedge){
- done = 0;
+ int done = 0;
+
while(!done){
done = 1;
e = v->e;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -734,11 +734,12 @@
int BMO_Vert_CountEdgeFlags(BMesh *bm, BMVert *v, int toolflag)
{
- BMEdge *curedge;
- int i, len=0, count=0;
-
+ int count= 0;
+
if(v->e) {
- len = bmesh_disk_count(v);
+ BMEdge *curedge;
+ const int len= bmesh_disk_count(v);
+ int i;
for(i = 0, curedge=v->e; i<len; i++){
if (BMO_TestFlag(bm, curedge, toolflag))
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_polygon.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -468,10 +468,9 @@
{
BMIter iter;
BMLoop *l;
- int i;
if(f->len > 4) {
- i = 0;
+ int i = 0;
BM_ITER(l, &iter, bm, BM_LOOPS_OF_FACE, f) {
copy_v3_v3(projectverts[i], l->v->co);
l = l->next;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_queries.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -65,11 +65,11 @@
BMLoop *BM_OtherFaceLoop(BMEdge *e, BMFace *f, BMVert *v)
{
BMLoop *l = bm_firstfaceloop(f) /*, *l2, *l3*/;
- int found = 0;
+ /* int found = 0; */ /* UNUSED */
do {
if (l->e == e) break;
- found = 1;
+ /*found = 1; */ /* UNUSED */
l = l->next;
} while (l != bm_firstfaceloop(f));
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -106,16 +106,21 @@
BMFace *source_face, BMesh *target_mesh,
BMVert **vtar, BMEdge **edar, GHash *vhash, GHash
*ehash)
{
- BMVert *target_vert1, *target_vert2;
+ /* BMVert *target_vert1, *target_vert2; */ /* UNUSED */
BMLoop *source_loop, *target_loop;
BMFace *target_face = NULL;
BMIter iter, iter2;
int i;
/*lookup the first and second verts*/
+#if 0 /* UNUSED */
target_vert1 = BLI_ghash_lookup(vhash, BMIter_New(&iter, source_mesh,
BM_VERTS_OF_FACE, source_face));
target_vert2 = BLI_ghash_lookup(vhash, BMIter_Step(&iter));
-
+#else
+ BMIter_New(&iter, source_mesh, BM_VERTS_OF_FACE, source_face);
+ BMIter_Step(&iter);
+#endif
+
/*lookup edges*/
for (i=0,source_loop=BMIter_New(&iter, source_mesh, BM_LOOPS_OF_FACE,
source_face);
source_loop; source_loop=BMIter_Step(&iter), i++) {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/operators/edgesplitop.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -70,14 +70,14 @@
BMFace *f2;
BMLoop *l, *l2;
BMEdge *e;
- BMVert *lastv1, *lastv2, *v1, *v2;
+ BMVert *lastv1, *lastv2 /* , *v1, *v2 */ /* UNUSED */;
int i;
/*we do final edge last*/
lastv1 = verts[f->len-1];
lastv2 = verts[0];
- v1 = verts[0];
- v2 = verts[1];
+ /* v1 = verts[0]; */ /* UNUSED */
+ /* v2 = verts[1]; */ /* UNUSED */
for (i=0; i<f->len-1; i++) {
e = BM_Make_Edge(bm, verts[i], verts[i+1], NULL, 1);
if (!e) {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -402,8 +402,7 @@
}
BM_ITER(e, &eiter, bm, BM_EDGES_OF_MESH, NULL) {
- float angle;
-
+
/* If the edge is not part of a the solidify region
its normal should not be considered */
if (!BMO_TestFlag(bm, e, EDGE_MARK)) {
@@ -433,7 +432,7 @@
BLI_assert(f1 != NULL);
if (f2 != NULL) {
- angle = angle_normalized_v3v3(f1->no, f2->no);
+ const float angle = angle_normalized_v3v3(f1->no,
f2->no);
if (angle > 0.0f) {
/* two faces using this edge, calculate the
edge normal
Modified: branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
===================================================================
--- branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2011-10-29 11:15:12 UTC (rev 41361)
+++ branches/bmesh/blender/source/blender/bmesh/operators/mesh_conv.c
2011-10-29 11:23:37 UTC (rev 41362)
@@ -192,7 +192,7 @@
mpoly = me->mpoly;
for (i=0; i<me->totpoly; i++, mpoly++) {
- BMVert *v1, *v2;
+ BMVert *v1 /* , *v2 */ /* UNUSED */;
BMIter iter;
BMLoop *l;
@@ -213,10 +213,12 @@
v1 = vt[me->mloop[mpoly->loopstart].v];
/* v2 = vt[me->mloop[mpoly->loopstart+1].v]; */ /* UNUSED */ /*
code below always overwrites */
- if (v1 == fedges[0]->v1) v2 = fedges[0]->v2;
+ if (v1 == fedges[0]->v1) {
+ /* v2 = fedges[0]->v2; */ /* UNUSED */
+ }
else {
v1 = fedges[0]->v2;
- v2 = fedges[0]->v1;
+ /* v2 = fedges[0]->v1; */ /* UNUSED */
}
f = BM_Make_Face(bm, verts, fedges, mpoly->totloop, 0);
@@ -398,7 +400,6 @@
Mesh *me = BMO_Get_Pnt(op, "mesh");
/* Object *ob = BMO_Get_Pnt(op, "object"); */
MLoop *mloop;
- KeyBlock *block;
MPoly *mpoly;
MVert *mvert, *oldverts;
MEdge *medge;
@@ -737,6 +738,7 @@
/* see comment below, this logic is in twice */
if (me->key) {
+ KeyBlock *currkey;
KeyBlock *actkey= BLI_findlink(&me->key->block, bm->shapenr-1);
float (*ofs)[3] = NULL;
@@ -749,18 +751,18 @@
if (bm->vdata.layers[i].type != CD_SHAPEKEY)
continue;
- for (block=me->key->block.first; block;
block=block->next) {
- if (block->uid == bm->vdata.layers[i].uid)
+ for (currkey=me->key->block.first; currkey;
currkey=currkey->next) {
+ if (currkey->uid == bm->vdata.layers[i].uid)
break;
}
- if (!block) {
- block = MEM_callocN(sizeof(KeyBlock), "KeyBlock
mesh_conv.c");
- block->type = KEY_LINEAR;
- block->slidermin = 0.0f;
- block->slidermax = 1.0f;
+ if (!currkey) {
+ currkey = MEM_callocN(sizeof(KeyBlock),
"KeyBlock mesh_conv.c");
+ currkey->type = KEY_LINEAR;
+ currkey->slidermin = 0.0f;
+ currkey->slidermax = 1.0f;
- BLI_addtail(&me->key->block, block);
+ BLI_addtail(&me->key->block, currkey);
me->key->totkey++;
}
@@ -772,8 +774,8 @@
if(me->key->type==KEY_RELATIVE && oldverts) {
int act_is_basis = 0;
/* find if this key is a basis for any others */
- for(block = me->key->block.first; block; block=
block->next) {
- if(bm->shapenr-1 == block->relative) {
+ for(currkey = me->key->block.first; currkey; currkey=
currkey->next) {
+ if(bm->shapenr-1 == currkey->relative) {
act_is_basis = 1;
break;
}
@@ -797,25 +799,25 @@
}
- for (block=me->key->block.first; block; block=block->next) {
+ for (currkey=me->key->block.first; currkey;
currkey=currkey->next) {
j = 0;
for (i=0; i<bm->vdata.totlayer; i++) {
if (bm->vdata.layers[i].type != CD_SHAPEKEY)
continue;
- if (block->uid == bm->vdata.layers[i].uid) {
- int apply_offset = (ofs && (block !=
actkey) && (bm->shapenr-1 == block->relative));
+ if (currkey->uid == bm->vdata.layers[i].uid) {
+ int apply_offset = (ofs && (currkey !=
actkey) && (bm->shapenr-1 == currkey->relative));
float *fp, *co;
float (*ofs_pt)[3] = ofs;
- if (block->data)
- MEM_freeN(block->data);
- block->data = fp =
MEM_mallocN(sizeof(float)*3*bm->totvert, "shape key data");
- block->totelem = bm->totvert;
+ if (currkey->data)
+ MEM_freeN(currkey->data);
+ currkey->data = fp =
MEM_mallocN(sizeof(float)*3*bm->totvert, "shape key data");
+ currkey->totelem = bm->totvert;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
