[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55335] trunk/blender/source/blender: code cleanup: shadowing
Campbell Barton
ideasman42 at gmail.com
Sat Mar 16 15:33:32 CET 2013
Revision: 55335
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55335
Author: campbellbarton
Date: 2013-03-16 14:33:32 +0000 (Sat, 16 Mar 2013)
Log Message:
-----------
code cleanup: shadowing
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/bmesh/operators/bmo_connect.c
trunk/blender/source/blender/bmesh/operators/bmo_create.c
trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
trunk/blender/source/blender/bmesh/tools/bmesh_edgesplit.c
trunk/blender/source/blender/editors/render/render_update.c
trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -1116,12 +1116,12 @@
}
}
-static DMWeightColorInfo dm_wcinfo;
+static DMWeightColorInfo G_dm_wcinfo;
void vDM_ColorBand_store(const ColorBand *coba, const char alert_color[4])
{
- dm_wcinfo.coba = coba;
- dm_wcinfo.alert_color = alert_color;
+ G_dm_wcinfo.coba = coba;
+ G_dm_wcinfo.alert_color = alert_color;
}
/* return an array of vertex weight colors, caller must free.
@@ -1219,11 +1219,11 @@
if (indices)
MEM_freeN(w);
}
+ else {
+ /* No weights given, take them from active vgroup(s). */
+ wtcol_v = calc_weightpaint_vert_array(ob, dm, draw_flag, &G_dm_wcinfo);
+ }
- /* No weights given, take them from active vgroup(s). */
- else
- wtcol_v = calc_weightpaint_vert_array(ob, dm, draw_flag, &dm_wcinfo);
-
/* now add to loops, so the data can be passed through the modifier stack */
/* If no CD_PREVIEW_MLOOPCOL existed yet, we have to add a new one! */
if (!wtcol_l) {
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -1588,13 +1588,13 @@
void BKE_mesh_to_curve_nurblist(DerivedMesh *dm, ListBase *nurblist, const int edge_users_test)
{
- MVert *mverts = dm->getVertArray(dm);
+ MVert *mvert = dm->getVertArray(dm);
MEdge *med, *medge = dm->getEdgeArray(dm);
MPoly *mp, *mpoly = dm->getPolyArray(dm);
MLoop *mloop = dm->getLoopArray(dm);
- int totedge = dm->getNumEdges(dm);
- int totpoly = dm->getNumPolys(dm);
+ int dm_totedge = dm->getNumEdges(dm);
+ int dm_totpoly = dm->getNumPolys(dm);
int totedges = 0;
int i;
@@ -1604,8 +1604,8 @@
ListBase edges = {NULL, NULL};
/* get boundary edges */
- edge_users = MEM_callocN(sizeof(int) * totedge, __func__);
- for (i = 0, mp = mpoly; i < totpoly; i++, mp++) {
+ edge_users = MEM_callocN(sizeof(int) * dm_totedge, __func__);
+ for (i = 0, mp = mpoly; i < dm_totpoly; i++, mp++) {
MLoop *ml = &mloop[mp->loopstart];
int j;
for (j = 0; j < mp->totloop; j++, ml++) {
@@ -1615,7 +1615,7 @@
/* create edges from all faces (so as to find edges not in any faces) */
med = medge;
- for (i = 0; i < totedge; i++, med++) {
+ for (i = 0; i < dm_totedge; i++, med++) {
if (edge_users[i] == edge_users_test) {
EdgeLink *edl = MEM_callocN(sizeof(EdgeLink), "EdgeLink");
edl->edge = med;
@@ -1705,7 +1705,7 @@
/* add points */
vl = polyline.first;
for (i = 0, bp = nu->bp; i < totpoly; i++, bp++, vl = (VertLink *)vl->next) {
- copy_v3_v3(bp->vec, mverts[vl->index].co);
+ copy_v3_v3(bp->vec, mvert[vl->index].co);
bp->f1 = SELECT;
bp->radius = bp->weight = 1.0;
}
Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -3103,7 +3103,6 @@
int numTex, numCol;
int hasPCol, hasOrigSpace;
int gridInternalEdges;
- float *w = NULL;
WeightTable wtable = {0};
/* MCol *mcol; */ /* UNUSED */
MEdge *medge = NULL;
@@ -3291,7 +3290,7 @@
int numFinalEdges = numVerts * (gridSideEdges + gridInternalEdges);
int origIndex = GET_INT_FROM_POINTER(ccgSubSurf_getFaceFaceHandle(f));
int g2_wid = gridCuts + 2;
- float *w2;
+ float *w, *w2;
int s, x, y;
w = get_ss_weights(&wtable, gridCuts, numVerts);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -160,19 +160,19 @@
* isn't there should be... */
#define ARRAY_SWAP(elemtype, arr1, arr2) \
{ \
- int i; \
+ int i_; \
elemtype *arr_tmp = NULL; \
BLI_array_declare(arr_tmp); \
- for (i = 0; i < BLI_array_count(arr1); i++) { \
- BLI_array_append(arr_tmp, arr1[i]); \
+ for (i_ = 0; i_ < BLI_array_count(arr1); i_++) { \
+ BLI_array_append(arr_tmp, arr1[i_]); \
} \
BLI_array_empty(arr1); \
- for (i = 0; i < BLI_array_count(arr2); i++) { \
- BLI_array_append(arr1, arr2[i]); \
+ for (i_ = 0; i_ < BLI_array_count(arr2); i_++) { \
+ BLI_array_append(arr1, arr2[i_]); \
} \
BLI_array_empty(arr2); \
- for (i = 0; i < BLI_array_count(arr_tmp); i++) { \
- BLI_array_append(arr2, arr_tmp[i]); \
+ for (i_ = 0; i_ < BLI_array_count(arr_tmp); i_++) { \
+ BLI_array_append(arr2, arr_tmp[i_]); \
} \
BLI_array_free(arr_tmp); \
} (void)0
Modified: trunk/blender/source/blender/bmesh/operators/bmo_create.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_create.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/bmesh/operators/bmo_create.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -810,9 +810,9 @@
}
if (use_restrict) {
- int *group = (int *)BMO_slot_map_data_get(slot_restrict, e);
- if (group) {
- if (!(*group & path->group)) {
+ int *group_flag = (int *)BMO_slot_map_data_get(slot_restrict, e);
+ if (group_flag) {
+ if (!(*group_flag & path->group)) {
v2 = NULL;
continue;
}
@@ -925,15 +925,12 @@
BMO_elem_flag_enable(bm, f, ELE_ORIG);
}
- i = 0;
- BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
+ BM_ITER_MESH_INDEX (e, &iter, bm, BM_EDGES_OF_MESH, i) {
BM_elem_index_set(e, i); /* set_inline */
if (!BMO_elem_flag_test(bm, e, EDGE_MARK)) {
edata[i].tag = 2;
}
-
- i++;
}
bm->elem_index_dirty &= ~BM_EDGE;
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -181,7 +181,6 @@
unsigned vert_seek_b_tot = 0;
#endif
- BMVert *v;
BMIter iter;
const unsigned int offset = 0;
@@ -192,12 +191,14 @@
/* if tag_only is set, we assume the caller knows what verts to tag
* needed for the operator */
if (tag_only == false) {
+ BMVert *v;
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
BM_elem_flag_enable(v, BM_ELEM_TAG);
}
}
for (iter_step = 0; iter_step < iterations; iter_step++) {
+ BMVert *v;
bool iter_done;
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
@@ -223,7 +224,6 @@
unsigned int i;
#endif
BMVert *v_first = NULL;
- BMVert *v;
/* we could avoid iterating from the start each time */
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
Modified: trunk/blender/source/blender/bmesh/tools/bmesh_edgesplit.c
===================================================================
--- trunk/blender/source/blender/bmesh/tools/bmesh_edgesplit.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/bmesh/tools/bmesh_edgesplit.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -48,7 +48,6 @@
BMEdge *e;
unsigned char *vtouch;
- unsigned char *vt;
BM_mesh_elem_index_ensure(bm, BM_VERT);
@@ -65,6 +64,7 @@
BM_elem_flag_disable(e, BM_ELEM_TAG);
}
else if (BM_edge_is_boundary(e)) {
+ unsigned char *vt;
vt = &vtouch[BM_elem_index_get(e->v1)]; if (*vt < 2) (*vt)++;
vt = &vtouch[BM_elem_index_get(e->v2)]; if (*vt < 2) (*vt)++;
Modified: trunk/blender/source/blender/editors/render/render_update.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_update.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/editors/render/render_update.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -394,8 +394,6 @@
if (dm && totmaterial && material) {
for (a = 0; a < *totmaterial; a++) {
- Material *ma;
-
if (ob->matbits && ob->matbits[a])
ma = ob->mat[a];
else
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c 2013-03-16 14:18:32 UTC (rev 55334)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c 2013-03-16 14:33:32 UTC (rev 55335)
@@ -458,7 +458,6 @@
float quat[4];
float axis[3];
float angle;
- int j;
const float px_scale = (ED_view3d_pixel_size(rv3d, ruler_item->co[1]) *
min_fff(arc_size,
len_v2v2(co_ss[0], co_ss[1]) / 2.0f,
More information about the Bf-blender-cvs
mailing list