[Bf-blender-cvs] [2e348fd] master: Cleanup: shadowing (blenkernel)
Campbell Barton
noreply at git.blender.org
Mon Nov 23 07:51:50 CET 2015
Commit: 2e348fd43ee2bc7285fe4461171d51f307dabf92
Author: Campbell Barton
Date: Mon Nov 23 11:27:02 2015 +1100
Branches: master
https://developer.blender.org/rB2e348fd43ee2bc7285fe4461171d51f307dabf92
Cleanup: shadowing (blenkernel)
===================================================================
M source/blender/blenkernel/intern/CCGSubSurf_legacy.c
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/multires.c
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/pointcache.c
M source/blender/blenkernel/intern/smoke.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/tracking.c
M source/blender/blenkernel/intern/tracking_auto.c
===================================================================
diff --git a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
index 6adef1c..afa4404 100644
--- a/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
+++ b/source/blender/blenkernel/intern/CCGSubSurf_legacy.c
@@ -322,15 +322,16 @@ static void ccgSubSurf__calcVertNormals(CCGSubSurf *ss,
}
}
-static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss,
- CCGVert **effectedV, CCGEdge **effectedE, CCGFace **effectedF,
- int numEffectedV, int numEffectedE, int numEffectedF, int curLvl)
+static void ccgSubSurf__calcSubdivLevel(
+ CCGSubSurf *ss,
+ CCGVert **effectedV, CCGEdge **effectedE, CCGFace **effectedF,
+ const int numEffectedV, const int numEffectedE, const int numEffectedF, const int curLvl)
{
- int subdivLevels = ss->subdivLevels;
+ const int subdivLevels = ss->subdivLevels;
+ const int nextLvl = curLvl + 1;
int edgeSize = ccg_edgesize(curLvl);
int gridSize = ccg_gridsize(curLvl);
- int nextLvl = curLvl + 1;
- int ptrIdx, cornerIdx, i;
+ int ptrIdx, i;
int vertDataSize = ss->meshIFC.vertDataSize;
float *q = ss->q, *r = ss->r;
@@ -524,7 +525,7 @@ static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss,
VertDataAdd(nCo, r, ss);
}
else {
- int cornerIdx = (1 + (1 << (curLvl))) - 2;
+ const int cornerIdx = (1 + (1 << (curLvl))) - 2;
int numEdges = 0, numFaces = 0;
VertDataZero(q, ss);
@@ -683,8 +684,6 @@ static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss,
#pragma omp parallel private(ptrIdx) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
{
- float *q, *r;
-
#pragma omp critical
{
q = MEM_mallocN(ss->meshIFC.vertDataSize, "CCGSubsurf q");
@@ -792,7 +791,7 @@ static void ccgSubSurf__calcSubdivLevel(CCGSubSurf *ss,
/* copy down */
edgeSize = ccg_edgesize(nextLvl);
gridSize = ccg_gridsize(nextLvl);
- cornerIdx = gridSize - 1;
+ const int cornerIdx = gridSize - 1;
#pragma omp parallel for private(i) if (numEffectedF * edgeSize * edgeSize * 4 >= CCG_OMP_LIMIT)
for (i = 0; i < numEffectedE; i++) {
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 3c83fbe..0c10a40 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -582,7 +582,6 @@ void DM_update_tessface_data(DerivedMesh *dm)
void DM_generate_tangent_tessface_data(DerivedMesh *dm, bool generate)
{
- int i;
MFace *mf, *mface = dm->getTessFaceArray(dm);
MPoly *mp = dm->getPolyArray(dm);
MLoop *ml = dm->getLoopArray(dm);
@@ -602,9 +601,10 @@ void DM_generate_tangent_tessface_data(DerivedMesh *dm, bool generate)
return;
if (generate) {
- for (i = 0; i < ldata->totlayer; i++) {
- if (ldata->layers[i].type == CD_TANGENT)
+ for (int i = 0; i < ldata->totlayer; i++) {
+ if (ldata->layers[i].type == CD_TANGENT) {
CustomData_add_layer_named(fdata, CD_TANGENT, CD_CALLOC, NULL, totface, ldata->layers[i].name);
+ }
}
CustomData_bmesh_update_active_layers(fdata, pdata, ldata);
}
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 85383cc..ec3dd92 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -2730,8 +2730,8 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
float hard = min_ff(bulge, bulge_max);
float range = bulge_max - 1.0f;
- float scale = (range > 0.0f) ? 1.0f / range : 0.0f;
- float soft = 1.0f + range * atanf((bulge - 1.0f) * scale) / (float)M_PI_2;
+ float scale_fac = (range > 0.0f) ? 1.0f / range : 0.0f;
+ float soft = 1.0f + range * atanf((bulge - 1.0f) * scale_fac) / (float)M_PI_2;
bulge = interpf(soft, hard, data->bulge_smooth);
}
@@ -2742,8 +2742,8 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
float hard = max_ff(bulge, bulge_min);
float range = 1.0f - bulge_min;
- float scale = (range > 0.0f) ? 1.0f / range : 0.0f;
- float soft = 1.0f - range * atanf((1.0f - bulge) * scale) / (float)M_PI_2;
+ float scale_fac = (range > 0.0f) ? 1.0f / range : 0.0f;
+ float soft = 1.0f - range * atanf((1.0f - bulge) * scale_fac) / (float)M_PI_2;
bulge = interpf(soft, hard, data->bulge_smooth);
}
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 2235825..b518a1f 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -2632,7 +2632,7 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render)
BezTriple *bezt, *prevbezt;
BPoint *bp;
BevList *bl, *blnew, *blnext;
- BevPoint *bevp, *bevp2, *bevp1 = NULL, *bevp0;
+ BevPoint *bevp2, *bevp1 = NULL, *bevp0;
const float treshold = 0.00001f;
float min, inp;
float *seglen = NULL;
@@ -2681,6 +2681,8 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render)
bl->charidx = nu->charidx;
}
else {
+ BevPoint *bevp;
+
if (for_render && cu->resolu_ren != 0)
resolu = cu->resolu_ren;
else
@@ -3012,6 +3014,7 @@ void BKE_curve_bevelList_make(Object *ob, ListBase *nurbs, bool for_render)
bl = bev->first;
while (bl) {
if (bl->poly > 0) {
+ BevPoint *bevp;
min = 300000.0;
bevp = bl->bevpoints;
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index f3ce988..0a9a7a3 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -2536,11 +2536,11 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface)
/* Generate surface adjacency data. */
{
- int i, cursor = 0;
+ int cursor = 0;
/* Create a temporary array of final indexes (before unassigned
* pixels have been dropped) */
- for (i = 0; i < w * h; i++) {
+ for (int i = 0; i < w * h; i++) {
if (tempPoints[i].tri_index != -1) {
final_index[i] = cursor;
cursor++;
@@ -2556,13 +2556,13 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface)
for (ty = 0; ty < h; ty++) {
int tx;
for (tx = 0; tx < w; tx++) {
- int i, index = tx + w * ty;
+ int index = tx + w * ty;
if (tempPoints[index].tri_index != -1) {
ed->n_index[final_index[index]] = n_pos;
ed->n_num[final_index[index]] = 0;
- for (i = 0; i < 8; i++) {
+ for (int i = 0; i < 8; i++) {
/* Try to find a neighboring pixel in defined direction
* If not found, -1 is returned */
@@ -3628,7 +3628,6 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
float timescale)
{
ParticleSettings *part = psys->part;
- ParticleData *pa = NULL;
PaintSurfaceData *sData = surface->data;
PaintBakeData *bData = sData->bData;
VolumeGrid *grid = bData->grid;
@@ -3654,7 +3653,8 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
tree = BLI_kdtree_new(psys->totpart);
/* loop through particles and insert valid ones to the tree */
- for (p = 0, pa = psys->particles; p < psys->totpart; p++, pa++) {
+ p = 0;
+ for (ParticleData *pa = psys->particles; p < psys->totpart; p++, pa++) {
/* Proceed only if particle is active */
if (pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN) == 0) continue;
diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c
index f01e622..49dd0b1 100644
--- a/source/blender/blenkernel/intern/mesh_validate.c
+++ b/source/blender/blenkernel/intern/mesh_validate.c
@@ -171,10 +171,10 @@ static int search_poly_cmp(const void *v1, const void *v2)
return sp1->invalid ? (sp2->invalid ? 0 : 1) : -1;
/* Else, sort on first non-equal verts (remember verts of valid polys are sorted). */
for (idx = 0; idx < max_idx; idx++) {
- const int v1 = sp1->verts[idx];
- const int v2 = sp2->verts[idx];
- if (v1 != v2) {
- return (v1 > v2) ? 1 : -1;
+ const int v1_i = sp1->verts[idx];
+ const int v2_i = sp2->verts[idx];
+ if (v1_i != v2_i) {
+ return (v1_i > v2_i) ? 1 : -1;
}
}
return sp1->numverts > sp2->numverts ? 1 : sp1->numverts < sp2->numverts ? -1 : 0;
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index fbba624..0adc894 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -1855,7 +1855,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
Multires *mr = me->mr;
MVert *vsrc, *vdst;
unsigned int src, dst;
- int st = multires_side_tot[totlvl - 1] - 1;
+ int st_last = multires_side_tot[totlvl - 1] - 1;
int extedgelen = multires_side_tot[totlvl] - 2;
int *vvmap; // inorder for dst, map to src
int crossedgelen;
@@ -1901,7 +1901,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
int sides = lvl1->faces[i].v[3] ? 4 : 3;
vvmap[dst] = src + lvl1->totedge + i;
- dst += 1 + sides * (st - 1) * st;
+ dst += 1 + sides * (st_last - 1) * st_last;
}
@@ -1943,7 +1943,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
lvl = lvl->next;
}
- dst += sides * (st - 1) * st;
+ dst += sides * (st_last - 1) * st_last;
if (sides == 4) ++totquad;
else ++tottri;
@@ -1967,7 +1967,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
dst = 0;
for (j = 0; j < lvl1->totface; ++j) {
int sides = lvl1->faces[j].v[3] ? 4 : 3;
- int ldst = dst + 1 + sides * (st - 1);
+ int ldst = dst + 1 + sides * (st_last - 1);
for (s = 0; s < sides; ++s) {
int st2 = multires_side_tot[totlvl - 1] - 2;
@@ -1984,7 +1984,7 @@ static void multires_load_old_dm(DerivedMesh *dm, Mesh *me, int totlvl)
find_old_edge(emap[0], lvl1->edges, cv, nv)->mid,
st2, st4);
- ldst += (st - 1) * (st - 1);
+ lds
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list