[Bf-blender-cvs] [f8aad78830c] master: Cleanup: reduce variable scopes
Jacques Lucke
noreply at git.blender.org
Wed Sep 9 16:37:08 CEST 2020
Commit: f8aad78830c185af50ab08f9362d637a23746447
Author: Jacques Lucke
Date: Wed Sep 9 16:35:20 2020 +0200
Branches: master
https://developer.blender.org/rBf8aad78830c185af50ab08f9362d637a23746447
Cleanup: reduce variable scopes
===================================================================
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/data_transfer.c
M source/blender/blenkernel/intern/deform.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/editmesh_bvh.c
M source/blender/blenkernel/intern/effect.c
M source/blender/blenkernel/intern/fcurve.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/fmodifier.c
M source/blender/blenkernel/intern/font.c
M source/blender/blenkernel/intern/gpencil_geom.c
M source/blender/blenkernel/intern/icons.c
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/image_save.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/mask_evaluate.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mball_tessellate.c
M source/blender/blenkernel/intern/mesh_convert.c
M source/blender/blenkernel/intern/mesh_evaluate.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index f50b3e3dc79..351f73ea76e 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -5185,7 +5185,6 @@ void BKE_curve_transform(Curve *cu, const float mat[4][4], const bool do_keys, c
void BKE_curve_translate(Curve *cu, const float offset[3], const bool do_keys)
{
ListBase *nurb_lb = BKE_curve_nurbs_get(cu);
- Nurb *nu;
LISTBASE_FOREACH (Nurb *, nu, nurb_lb) {
if (nu->type == CU_BEZIER) {
diff --git a/source/blender/blenkernel/intern/data_transfer.c b/source/blender/blenkernel/intern/data_transfer.c
index 1b35fdd1706..7a3a6ea44a9 100644
--- a/source/blender/blenkernel/intern/data_transfer.c
+++ b/source/blender/blenkernel/intern/data_transfer.c
@@ -101,13 +101,12 @@ bool BKE_object_data_transfer_get_dttypes_capacity(const int dtdata_types,
bool *r_advanced_mixing,
bool *r_threshold)
{
- int i;
bool ret = false;
*r_advanced_mixing = false;
*r_threshold = false;
- for (i = 0; (i < DT_TYPE_MAX) && !(ret && *r_advanced_mixing && *r_threshold); i++) {
+ for (int i = 0; (i < DT_TYPE_MAX) && !(ret && *r_advanced_mixing && *r_threshold); i++) {
const int dtdata_type = 1 << i;
if (!(dtdata_types & dtdata_type)) {
@@ -451,9 +450,7 @@ static void data_transfer_interp_char(const CustomDataTransferLayerMap *laymap,
float val_src = 0.0f;
const float val_dst = (float)(*data_dst) / 255.0f;
- int i;
-
- for (i = count; i--;) {
+ for (int i = count; i--;) {
val_src += ((float)(*data_src[i]) / 255.0f) * weights[i];
}
@@ -1254,7 +1251,6 @@ void BKE_object_data_transfer_layout(struct Depsgraph *depsgraph,
{
Mesh *me_src;
Mesh *me_dst;
- int i;
const bool use_create = true; /* We always create needed layers here. */
@@ -1272,7 +1268,7 @@ void BKE_object_data_transfer_layout(struct Depsgraph *depsgraph,
}
/* Check all possible data types. */
- for (i = 0; i < DT_TYPE_MAX; i++) {
+ for (int i = 0; i < DT_TYPE_MAX; i++) {
const int dtdata_type = 1 << i;
int cddata_type;
int fromlayers, tolayers, fromto_idx;
@@ -1410,7 +1406,6 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
Mesh *me_src;
/* Assumed always true if not using an evaluated mesh as destination. */
bool dirty_nors_dst = true;
- int i;
MDeformVert *mdef = NULL;
int vg_idx = -1;
@@ -1478,7 +1473,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
/* Check all possible data types.
* Note item mappings and dest mix weights are cached. */
- for (i = 0; i < DT_TYPE_MAX; i++) {
+ for (int i = 0; i < DT_TYPE_MAX; i++) {
const int dtdata_type = 1 << i;
int cddata_type;
int fromlayers, tolayers, fromto_idx;
@@ -1850,7 +1845,7 @@ bool BKE_object_data_transfer_ex(struct Depsgraph *depsgraph,
data_transfer_dtdata_type_postprocess(ob_src, ob_dst, me_src, me_dst, dtdata_type, changed);
}
- for (i = 0; i < DATAMAX; i++) {
+ for (int i = 0; i < DATAMAX; i++) {
BKE_mesh_remap_free(&geom_map[i]);
MEM_SAFE_FREE(weights[i]);
}
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index 74a8a4268fc..f7cf4faf7cb 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -200,9 +200,8 @@ void BKE_defvert_copy_index(MDeformVert *dvert_dst,
void BKE_defvert_sync(MDeformVert *dvert_dst, const MDeformVert *dvert_src, const bool use_ensure)
{
if (dvert_src->totweight && dvert_dst->totweight) {
- int i;
- MDeformWeight *dw_src;
- for (i = 0, dw_src = dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) {
+ MDeformWeight *dw_src = dvert_src->dw;
+ for (int i = 0; i < dvert_src->totweight; i++, dw_src++) {
MDeformWeight *dw_dst;
if (use_ensure) {
dw_dst = BKE_defvert_ensure_index(dvert_dst, dw_src->def_nr);
@@ -228,9 +227,8 @@ void BKE_defvert_sync_mapped(MDeformVert *dvert_dst,
const bool use_ensure)
{
if (dvert_src->totweight && dvert_dst->totweight) {
- int i;
- MDeformWeight *dw_src;
- for (i = 0, dw_src = dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) {
+ MDeformWeight *dw_src = dvert_src->dw;
+ for (int i = 0; i < dvert_src->totweight; i++, dw_src++) {
if (dw_src->def_nr < flip_map_len) {
MDeformWeight *dw_dst;
if (use_ensure) {
@@ -254,8 +252,7 @@ void BKE_defvert_sync_mapped(MDeformVert *dvert_dst,
void BKE_defvert_remap(MDeformVert *dvert, const int *map, const int map_len)
{
MDeformWeight *dw = dvert->dw;
- unsigned int i;
- for (i = dvert->totweight; i != 0; i--, dw++) {
+ for (int i = dvert->totweight; i != 0; i--, dw++) {
if (dw->def_nr < map_len) {
BLI_assert(map[dw->def_nr] >= 0);
@@ -281,11 +278,9 @@ void BKE_defvert_normalize_subset(MDeformVert *dvert,
}
}
else {
- MDeformWeight *dw;
- unsigned int i;
+ MDeformWeight *dw = dvert->dw;
float tot_weight = 0.0f;
-
- for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
+ for (int i = dvert->totweight; i != 0; i--, dw++) {
if ((dw->def_nr < vgroup_tot) && vgroup_subset[dw->def_nr]) {
tot_weight += dw->weight;
}
@@ -293,7 +288,8 @@ void BKE_defvert_normalize_subset(MDeformVert *dvert,
if (tot_weight > 0.0f) {
float scalar = 1.0f / tot_weight;
- for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
+ dw = dvert->dw;
+ for (int i = dvert->totweight; i != 0; i--, dw++) {
if ((dw->def_nr < vgroup_tot) && vgroup_subset[dw->def_nr]) {
dw->weight *= scalar;
@@ -822,8 +818,7 @@ int BKE_defvert_find_shared(const MDeformVert *dvert_a, const MDeformVert *dvert
bool BKE_defvert_is_weight_zero(const struct MDeformVert *dvert, const int defgroup_tot)
{
MDeformWeight *dw = dvert->dw;
- unsigned int i;
- for (i = dvert->totweight; i != 0; i--, dw++) {
+ for (int i = dvert->totweight; i != 0; i--, dw++) {
if (dw->weight != 0.0f) {
/* check the group is in-range, happens on rare situations */
if (LIKELY(dw->def_nr < defgroup_tot)) {
@@ -841,7 +836,6 @@ float BKE_defvert_total_selected_weight(const struct MDeformVert *dv,
int defbase_tot,
const bool *defbase_sel)
{
- int i;
float total = 0.0f;
const MDeformWeight *dw = dv->dw;
@@ -849,7 +843,7 @@ float BKE_defvert_total_selected_weight(const struct MDeformVert *dv,
return total;
}
- for (i = dv->totweight; i != 0; i--, dw++) {
+ for (int i = dv->totweight; i != 0; i--, dw++) {
if (dw->def_nr < defbase_tot) {
if (defbase_sel[dw->def_nr]) {
total += dw->weight;
@@ -947,7 +941,6 @@ float BKE_defvert_lock_relative_weight(float weight,
void BKE_defvert_array_copy(MDeformVert *dst, const MDeformVert *src, int totvert)
{
/* Assumes dst is already set up */
- int i;
if (!src || !dst) {
return;
@@ -955,7 +948,7 @@ void BKE_defvert_array_copy(MDeformVert *dst, const MDeformVert *src, int totver
memcpy(dst, src, totvert * sizeof(MDeformVert));
- for (i = 0; i < totvert; i++) {
+ for (int i = 0; i < totvert; i++) {
if (src[i].dw) {
dst[i].dw = MEM_mallocN(sizeof(MDeformWeight) * src[i].totweight, "copy_deformWeight");
memcpy(dst[i].dw, src[i].dw, sizeof(MDeformWeight) * src[i].totweight);
@@ -968,14 +961,13 @@ void BKE_defvert_array_free_elems(MDeformVert *dvert, int totvert)
/* Instead of freeing the verts directly,
* call this function to delete any special
* vert data */
- int i;
if (!dvert) {
return;
}
/* Free any special data from the verts */
- for (i = 0; i < totvert; i++) {
+ for (int i = 0; i < totvert; i++) {
if (dvert[i].dw) {
MEM_freeN(dvert[i].dw);
}
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 50c9ce4fb75..b7309743af1 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -475,13 +475,12 @@ static void blendColors(const float t_color[3],
float result[4])
{
/* Same thing as BLI's blend_color_mix_float(), but for non-premultiplied alpha. */
- int i;
float i_alpha = 1.0f - s_alpha;
float f_alpha = t_alpha * i_alpha + s_alpha;
/* blend colors */
if (f_alpha) {
- for (i = 0; i < 3; i++) {
+ for (int i = 0; i < 3; i++) {
result[i] = (t_color[i] * t_alpha * i_alpha + s_color[i] * s_alpha) / f_alpha;
}
}
@@ -1429,9 +1428,6 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, const b
}
if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) {
- int i;
- int n_pos;
-
/* For vertex format, count every vertex that is connected by an edge */
int numOfEdges = mesh->totedge;
int numOfPolys = mesh->totpoly;
@@ -1440,7 +1436,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, const b
struct MLoop *mloop = mesh->mloop;
/* count number of edges per vertex */
- for (i = 0; i < numOfEdges; i++) {
+ for (int i = 0; i < numOfEdges; i++) {
ad->n_num[edge[i].v1]++;
ad->n_num[edge[i].v2]++;
@@ -1450,7 +1446,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, const b
/* also add number of vertices to temp_data
* to locate points on "mesh edge" */
- for (i = 0; i < numOfPolys; i++) {
+ for (int i = 0; i < numOfPolys; i++) {
for (int j = 0; j < mpoly[i].totloop; j++) {
temp_data[mloop[mpoly[i].loopstart + j].v]++;
}
@@ -1458,7 +1454,7 @@ static void dynamicPaint_initAdjacencyData(DynamicPaintSurface *surface, const b
/* now check if total number of edges+faces for
* each vertex is even, if not -> vertex is on mesh edge */
- for (i = 0; i < sData->total_points; i++) {
+ for (int i = 0; i < sData->total_points; i++) {
if ((temp_dat
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list