Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-09-09 17:35:20 +0300
committerJacques Lucke <jacques@blender.org>2020-09-09 17:36:57 +0300
commitf8aad78830c185af50ab08f9362d637a23746447 (patch)
tree414d60581b68b20d85381817ea312a554a25b564 /source/blender/blenkernel/intern/key.c
parent42e3eb8854c9495a197fd5fa9d0f7990c24cafa7 (diff)
Cleanup: reduce variable scopes
Diffstat (limited to 'source/blender/blenkernel/intern/key.c')
-rw-r--r--source/blender/blenkernel/intern/key.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 456325851a6..9cdbb30b90a 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -1242,7 +1242,6 @@ static float *get_weights_array(Object *ob, char *vgroup, WeightsArrayCache *cac
defgrp_index = BKE_object_defgroup_name_index(ob, vgroup);
if (defgrp_index != -1) {
float *weights;
- int i;
if (cache) {
if (cache->defgroup_weights == NULL) {
@@ -1260,6 +1259,7 @@ static float *get_weights_array(Object *ob, char *vgroup, WeightsArrayCache *cac
weights = MEM_mallocN(totvert * sizeof(float), "weights");
if (em) {
+ int i;
const int cd_dvert_offset = CustomData_get_offset(&em->bm->vdata, CD_MDEFORMVERT);
BM_ITER_MESH_INDEX (eve, &iter, em->bm, BM_VERTS_OF_MESH, i) {
dvert = BM_ELEM_CD_GET_VOID_P(eve, cd_dvert_offset);
@@ -1267,7 +1267,7 @@ static float *get_weights_array(Object *ob, char *vgroup, WeightsArrayCache *cac
}
}
else {
- for (i = 0; i < totvert; i++, dvert++) {
+ for (int i = 0; i < totvert; i++, dvert++) {
weights[i] = BKE_defvert_find_weight(dvert, defgrp_index);
}
}
@@ -1860,13 +1860,10 @@ KeyBlock *BKE_keyblock_from_object_reference(Object *ob)
/* get the appropriate KeyBlock given an index */
KeyBlock *BKE_keyblock_from_key(Key *key, int index)
{
- KeyBlock *kb;
- int i;
-
if (key) {
- kb = key->block.first;
+ KeyBlock *kb = key->block.first;
- for (i = 1; i < key->totkey; i++) {
+ for (int i = 1; i < key->totkey; i++) {
kb = kb->next;
if (index == i) {