diff options
author | Jacques Lucke <jacques@blender.org> | 2020-09-09 19:41:07 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-09-09 19:41:07 +0300 |
commit | 63916f5941b443dfc8566682bb75374e5abd553f (patch) | |
tree | fb0704701f1d4d9acbddf4a6fbc62c819d8d4c36 /source/blender/editors/object | |
parent | 0cff2c944f9c2cd3ac873fe826c4399fc2f32159 (diff) |
Cleanup: reduce variable scope
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r-- | source/blender/editors/object/object_bake_api.c | 27 | ||||
-rw-r--r-- | source/blender/editors/object/object_data_transfer.c | 18 | ||||
-rw-r--r-- | source/blender/editors/object/object_facemap_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/object/object_transform.c | 3 | ||||
-rw-r--r-- | source/blender/editors/object/object_vgroup.c | 68 | ||||
-rw-r--r-- | source/blender/editors/object/object_warp.c | 10 |
6 files changed, 45 insertions, 85 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 4d55aff1d1f..19097d95743 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -301,8 +301,7 @@ static bool write_internal_bake_pixels(Image *image, /* force OpenGL reload */ static void refresh_images(BakeImages *bake_images) { - int i; - for (i = 0; i < bake_images->size; i++) { + for (int i = 0; i < bake_images->size; i++) { Image *ima = bake_images->data[i].image; LISTBASE_FOREACH (ImageTile *, tile, &ima->tiles) { if (tile->ok == IMA_OK_LOADED) { @@ -413,10 +412,7 @@ static bool is_noncolor_pass(eScenePassType pass_type) /* if all is good tag image and return true */ static bool bake_object_check(ViewLayer *view_layer, Object *ob, ReportList *reports) { - Image *image; Base *base = BKE_view_layer_base_find(view_layer, ob); - void *lock; - int i; if (base == NULL) { BKE_reportf(reports, RPT_ERROR, "Object \"%s\" is not in view layer", ob->id.name + 2); @@ -440,10 +436,11 @@ static bool bake_object_check(ViewLayer *view_layer, Object *ob, ReportList *rep return false; } - for (i = 0; i < ob->totcol; i++) { + for (int i = 0; i < ob->totcol; i++) { bNodeTree *ntree = NULL; bNode *node = NULL; const int mat_nr = i + 1; + Image *image; ED_object_get_active_image(ob, mat_nr, &image, NULL, &node, &ntree); if (image) { @@ -462,6 +459,7 @@ static bool bake_object_check(ViewLayer *view_layer, Object *ob, ReportList *rep } } + void *lock; ibuf = BKE_image_acquire_ibuf(image, NULL, &lock); if (ibuf) { @@ -637,13 +635,12 @@ static void bake_images_clear(Main *bmain, const bool is_tangent) static void build_image_lookup(Main *bmain, Object *ob, BakeImages *bake_images) { const int tot_mat = ob->totcol; - int i, j; int tot_images = 0; /* error handling and tag (in case multiple materials share the same image) */ BKE_main_id_tag_idcode(bmain, ID_IM, LIB_TAG_DOIT, false); - for (i = 0; i < tot_mat; i++) { + for (int i = 0; i < tot_mat; i++) { Image *image; ED_object_get_active_image(ob, i + 1, &image, NULL, NULL, NULL); @@ -652,7 +649,7 @@ static void build_image_lookup(Main *bmain, Object *ob, BakeImages *bake_images) bake_images->lookup[i] = -1; } else if (image->id.tag & LIB_TAG_DOIT) { - for (j = 0; j < i; j++) { + for (int j = 0; j < i; j++) { if (bake_images->data[j].image == image) { bake_images->lookup[i] = j; break; @@ -675,15 +672,12 @@ static void build_image_lookup(Main *bmain, Object *ob, BakeImages *bake_images) */ static size_t init_internal_images(BakeImages *bake_images, ReportList *reports) { - int i; size_t tot_size = 0; - for (i = 0; i < bake_images->size; i++) { - ImBuf *ibuf; - void *lock; - + for (int i = 0; i < bake_images->size; i++) { BakeImage *bk_image = &bake_images->data[i]; - ibuf = BKE_image_acquire_ibuf(bk_image->image, NULL, &lock); + void *lock; + ImBuf *ibuf = BKE_image_acquire_ibuf(bk_image->image, NULL, &lock); if (ibuf) { bk_image->width = ibuf->x; @@ -1228,8 +1222,7 @@ static int bake(Render *re, cleanup: if (highpoly) { - int i; - for (i = 0; i < tot_highpoly; i++) { + for (int i = 0; i < tot_highpoly; i++) { if (highpoly[i].me != NULL) { BKE_id_free(NULL, &highpoly[i].me->id); } diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index da00a88ab65..4884df1edb6 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -153,21 +153,18 @@ static const EnumPropertyItem *dt_layers_select_src_itemf(bContext *C, Object *ob_src = CTX_data_active_object(C); if (ob_src) { - Mesh *me_eval; - int num_data, i; - Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src); CustomData_MeshMasks cddata_masks = CD_MASK_BAREMESH; cddata_masks.lmask |= CD_MASK_MLOOPUV; - me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_src_eval, &cddata_masks); - num_data = CustomData_number_of_layers(&me_eval->ldata, CD_MLOOPUV); + Mesh *me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_src_eval, &cddata_masks); + int num_data = CustomData_number_of_layers(&me_eval->ldata, CD_MLOOPUV); RNA_enum_item_add_separator(&item, &totitem); - for (i = 0; i < num_data; i++) { + for (int i = 0; i < num_data; i++) { tmp_item.value = i; tmp_item.identifier = tmp_item.name = CustomData_get_layer_name( &me_eval->ldata, CD_MLOOPUV, i); @@ -179,21 +176,18 @@ static const EnumPropertyItem *dt_layers_select_src_itemf(bContext *C, Object *ob_src = CTX_data_active_object(C); if (ob_src) { - Mesh *me_eval; - int num_data, i; - Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); Scene *scene_eval = DEG_get_evaluated_scene(depsgraph); Object *ob_src_eval = DEG_get_evaluated_object(depsgraph, ob_src); CustomData_MeshMasks cddata_masks = CD_MASK_BAREMESH; cddata_masks.lmask |= CD_MASK_MLOOPCOL; - me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_src_eval, &cddata_masks); - num_data = CustomData_number_of_layers(&me_eval->ldata, CD_MLOOPCOL); + Mesh *me_eval = mesh_get_eval_final(depsgraph, scene_eval, ob_src_eval, &cddata_masks); + int num_data = CustomData_number_of_layers(&me_eval->ldata, CD_MLOOPCOL); RNA_enum_item_add_separator(&item, &totitem); - for (i = 0; i < num_data; i++) { + for (int i = 0; i < num_data; i++) { tmp_item.value = i; tmp_item.identifier = tmp_item.name = CustomData_get_layer_name( &me_eval->ldata, CD_MLOOPCOL, i); diff --git a/source/blender/editors/object/object_facemap_ops.c b/source/blender/editors/object/object_facemap_ops.c index 32668598df1..4e2b1eb21b6 100644 --- a/source/blender/editors/object/object_facemap_ops.c +++ b/source/blender/editors/object/object_facemap_ops.c @@ -136,10 +136,8 @@ static void object_fmap_remap_object_mode(Object *ob, const int *remap) Mesh *me = ob->data; if (CustomData_has_layer(&me->pdata, CD_FACEMAP)) { int *map = CustomData_get_layer(&me->pdata, CD_FACEMAP); - int i; - if (map) { - for (i = 0; i < me->totpoly; i++) { + for (int i = 0; i < me->totpoly; i++) { if (map[i] != -1) { map[i] = remap[map[i]]; } diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c index 52b572fb0dd..e2d043c3206 100644 --- a/source/blender/editors/object/object_transform.c +++ b/source/blender/editors/object/object_transform.c @@ -834,11 +834,10 @@ static int apply_objects_internal(bContext *C, } else if (ob->type == OB_FONT) { Curve *cu = ob->data; - int i; scale = mat3_to_scale(rsmat); - for (i = 0; i < cu->totbox; i++) { + for (int i = 0; i < cu->totbox; i++) { TextBox *tb = &cu->tb[i]; tb->x *= scale; tb->y *= scale; diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index de9cca38a6e..b8811408339 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -148,11 +148,9 @@ void ED_vgroup_data_clamp_range(ID *id, const int total) int dvert_tot; if (ED_vgroup_parray_alloc(id, &dvert_arr, &dvert_tot, false)) { - int i; - for (i = 0; i < dvert_tot; i++) { + for (int i = 0; i < dvert_tot; i++) { MDeformVert *dv = dvert_arr[i]; - int j; - for (j = 0; j < dv->totweight; j++) { + for (int j = 0; j < dv->totweight; j++) { if (dv->dw[j].def_nr >= total) { BKE_defvert_remove_group(dv, &dv->dw[j]); j--; @@ -213,18 +211,17 @@ bool ED_vgroup_parray_alloc(ID *id, if (me->dvert) { MVert *mvert = me->mvert; MDeformVert *dvert = me->dvert; - int i; *dvert_tot = me->totvert; *dvert_arr = MEM_mallocN(sizeof(void *) * me->totvert, "vgroup parray from me"); if (use_vert_sel) { - for (i = 0; i < me->totvert; i++) { + for (int i = 0; i < me->totvert; i++) { (*dvert_arr)[i] = (mvert[i].flag & SELECT) ? &dvert[i] : NULL; } } else { - for (i = 0; i < me->totvert; i++) { + for (int i = 0; i < me->totvert; i++) { (*dvert_arr)[i] = me->dvert + i; } } @@ -234,8 +231,6 @@ bool ED_vgroup_parray_alloc(ID *id, return false; } case ID_LT: { - int i = 0; - Lattice *lt = (Lattice *)id; lt = (lt->editlatt) ? lt->editlatt->latt : lt; @@ -245,12 +240,12 @@ bool ED_vgroup_parray_alloc(ID *id, *dvert_arr = MEM_mallocN(sizeof(void *) * (*dvert_tot), "vgroup parray from me"); if (use_vert_sel) { - for (i = 0; i < *dvert_tot; i++) { + for (int i = 0; i < *dvert_tot; i++) { (*dvert_arr)[i] = (def->f1 & SELECT) ? <->dvert[i] : NULL; } } else { - for (i = 0; i < *dvert_tot; i++) { + for (int i = 0; i < *dvert_tot; i++) { (*dvert_arr)[i] = lt->dvert + i; } } @@ -328,7 +323,6 @@ void ED_vgroup_parray_mirror_assign(Object *ob, MDeformVert **dvert_array, const BMEditMesh *em = BKE_editmesh_from_object(ob); MDeformVert **dvert_array_all = NULL; int dvert_tot_all; - int i; /* get an array of all verts, not only selected */ if (ED_vgroup_parray_alloc(ob->data, &dvert_array_all, &dvert_tot_all, false) == false) { @@ -340,7 +334,7 @@ void ED_vgroup_parray_mirror_assign(Object *ob, MDeformVert **dvert_array, const BM_mesh_elem_table_ensure(em->bm, BM_VERT); } - for (i = 0; i < dvert_tot; i++) { + for (int i = 0; i < dvert_tot; i++) { if (dvert_array[i] == NULL) { /* its unselected, check if its mirror is */ int i_sel = ED_mesh_mirror_get_vert(ob, i); @@ -362,17 +356,14 @@ void ED_vgroup_parray_remove_zero(MDeformVert **dvert_array, const bool keep_single) { MDeformVert *dv; - int i; - - for (i = 0; i < dvert_tot; i++) { - int j; + for (int i = 0; i < dvert_tot; i++) { /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } - j = dv->totweight; + int j = dv->totweight; while (j--) { MDeformWeight *dw; @@ -482,9 +473,7 @@ void ED_vgroup_parray_to_weight_array(const MDeformVert **dvert_array, float *dvert_weights, const int def_nr) { - int i; - - for (i = 0; i < dvert_tot; i++) { + for (int i = 0; i < dvert_tot; i++) { const MDeformVert *dv = dvert_array[i]; dvert_weights[i] = dv ? BKE_defvert_find_weight(dv, def_nr) : 0.0f; } @@ -1163,7 +1152,7 @@ static bool vgroup_normalize(Object *ob) { MDeformWeight *dw; MDeformVert *dv, **dvert_array = NULL; - int i, dvert_tot = 0; + int dvert_tot = 0; const int def_nr = ob->actdef - 1; const bool use_vert_sel = vertex_group_use_vert_sel(ob); @@ -1177,7 +1166,7 @@ static bool vgroup_normalize(Object *ob) if (dvert_array) { float weight_max = 0.0f; - for (i = 0; i < dvert_tot; i++) { + for (int i = 0; i < dvert_tot; i++) { /* in case its not selected */ if (!(dv = dvert_array[i])) { @@ -1191,7 +1180,7 @@ static bool vgroup_normalize(Object *ob) } if (weight_max > 0.0f) { - for (i = 0; i < dvert_tot; i++) { + for (int i = 0; i < dvert_tot; i++) { /* in case its not selected */ if (!(dv = dvert_array[i])) { @@ -1599,7 +1588,7 @@ static void vgroup_levels_subset(Object *ob, { MDeformWeight *dw; MDeformVert *dv, **dvert_array = NULL; - int i, dvert_tot = 0; + int dvert_tot = 0; const bool use_vert_sel = vertex_group_use_vert_sel(ob); const bool use_mirror = (ob->type == OB_MESH) ? @@ -1610,15 +1599,13 @@ static void vgroup_levels_subset(Object *ob, if (dvert_array) { - for (i = 0; i < dvert_tot; i++) { - int j; - + for (int i = 0; i < dvert_tot; i++) { /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } - j = vgroup_tot; + int j = vgroup_tot; while (j--) { if (vgroup_validmap[j]) { dw = BKE_defvert_find_index(dv, j); @@ -1857,7 +1844,7 @@ static void vgroup_invert_subset(Object *ob, { MDeformWeight *dw; MDeformVert *dv, **dvert_array = NULL; - int i, dvert_tot = 0; + int dvert_tot = 0; const bool use_vert_sel = vertex_group_use_vert_sel(ob); const bool use_mirror = (ob->type == OB_MESH) ? (((Mesh *)ob->data)->editflag & ME_EDIT_MIRROR_X) != 0 : @@ -1866,15 +1853,13 @@ static void vgroup_invert_subset(Object *ob, ED_vgroup_parray_alloc(ob->data, &dvert_array, &dvert_tot, use_vert_sel); if (dvert_array) { - for (i = 0; i < dvert_tot; i++) { - int j; - + for (int i = 0; i < dvert_tot; i++) { /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } - j = vgroup_tot; + int j = vgroup_tot; while (j--) { if (vgroup_validmap[j]) { @@ -2271,21 +2256,20 @@ static void vgroup_quantize_subset(Object *ob, if (dvert_array) { const float steps_fl = steps; MDeformVert *dv; - int i; if (use_mirror && use_vert_sel) { ED_vgroup_parray_mirror_assign(ob, dvert_array, dvert_tot); } - for (i = 0; i < dvert_tot; i++) { + for (int i = 0; i < dvert_tot; i++) { MDeformWeight *dw; - int j; /* in case its not selected */ if (!(dv = dvert_array[i])) { continue; } + int j; for (j = 0, dw = dv->dw; j < dv->totweight; j++, dw++) { if ((dw->def_nr < vgroup_tot) && vgroup_validmap[dw->def_nr]) { dw->weight = floorf((dw->weight * steps_fl) + 0.5f) / steps_fl; @@ -2628,18 +2612,14 @@ static void vgroup_assign_verts(Object *ob, const float weight) } } else { - MVert *mv; - MDeformVert *dv; - int i; - if (!me->dvert) { BKE_object_defgroup_data_create(&me->id); } - mv = me->mvert; - dv = me->dvert; + MVert *mv = me->mvert; + MDeformVert *dv = me->dvert; - for (i = 0; i < me->totvert; i++, mv++, dv++) { + for (int i = 0; i < me->totvert; i++, mv++, dv++) { if (mv->flag & SELECT) { MDeformWeight *dw; dw = BKE_defvert_ensure_index(dv, def_nr); diff --git a/source/blender/editors/object/object_warp.c b/source/blender/editors/object/object_warp.c index 00f9330c8a7..b36a8543d67 100644 --- a/source/blender/editors/object/object_warp.c +++ b/source/blender/editors/object/object_warp.c @@ -71,11 +71,8 @@ static void object_warp_transverts_minmax_x(TransVertStore *tvs, const float x_ofs = (mat_view[3][0] - center_view[0]); float min = FLT_MAX, max = -FLT_MAX; - TransVert *tv; - int i; - - tv = tvs->transverts; - for (i = 0; i < tvs->transverts_tot; i++, tv++) { + TransVert *tv = tvs->transverts; + for (int i = 0; i < tvs->transverts_tot; i++, tv++) { float val; /* convert objectspace->viewspace */ @@ -97,7 +94,6 @@ static void object_warp_transverts(TransVertStore *tvs, const float max) { TransVert *tv; - int i; const float angle = -angle_; /* cache vars for tiny speedup */ #if 1 @@ -123,7 +119,7 @@ static void object_warp_transverts(TransVertStore *tvs, } tv = tvs->transverts; - for (i = 0; i < tvs->transverts_tot; i++, tv++) { + for (int i = 0; i < tvs->transverts_tot; i++, tv++) { float co[3], co_add[2]; float val, phi; |