diff options
Diffstat (limited to 'source/blender/blenkernel/intern/deform.c')
-rw-r--r-- | source/blender/blenkernel/intern/deform.c | 83 |
1 files changed, 40 insertions, 43 deletions
diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 98fc5f9a23a..1a32deac776 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -510,36 +510,35 @@ int *BKE_object_defgroup_flip_map(const Object *ob, int *flip_map_len, const boo if (defbase_tot == 0) { return NULL; } - else { - bDeformGroup *dg; - char name_flip[sizeof(dg->name)]; - int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__); - for (i = 0; i < defbase_tot; i++) { - map[i] = -1; - } + bDeformGroup *dg; + char name_flip[sizeof(dg->name)]; + int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__); - for (dg = ob->defbase.first, i = 0; dg; dg = dg->next, i++) { - if (map[i] == -1) { /* may be calculated previously */ + for (i = 0; i < defbase_tot; i++) { + map[i] = -1; + } - /* in case no valid value is found, use this */ - if (use_default) { - map[i] = i; - } + for (dg = ob->defbase.first, i = 0; dg; dg = dg->next, i++) { + if (map[i] == -1) { /* may be calculated previously */ - BLI_string_flip_side_name(name_flip, dg->name, false, sizeof(name_flip)); + /* in case no valid value is found, use this */ + if (use_default) { + map[i] = i; + } - if (!STREQ(name_flip, dg->name)) { - flip_num = BKE_object_defgroup_name_index(ob, name_flip); - if (flip_num >= 0) { - map[i] = flip_num; - map[flip_num] = i; /* save an extra lookup */ - } + BLI_string_flip_side_name(name_flip, dg->name, false, sizeof(name_flip)); + + if (!STREQ(name_flip, dg->name)) { + flip_num = BKE_object_defgroup_name_index(ob, name_flip); + if (flip_num >= 0) { + map[i] = flip_num; + map[flip_num] = i; /* save an extra lookup */ } } } - return map; } + return map; } /** @@ -555,29 +554,28 @@ int *BKE_object_defgroup_flip_map_single(const Object *ob, if (defbase_tot == 0) { return NULL; } - else { - bDeformGroup *dg; - char name_flip[sizeof(dg->name)]; - int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__); - for (i = 0; i < defbase_tot; i++) { - map[i] = use_default ? i : -1; - } + bDeformGroup *dg; + char name_flip[sizeof(dg->name)]; + int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__); - dg = BLI_findlink(&ob->defbase, defgroup); + for (i = 0; i < defbase_tot; i++) { + map[i] = use_default ? i : -1; + } - BLI_string_flip_side_name(name_flip, dg->name, false, sizeof(name_flip)); - if (!STREQ(name_flip, dg->name)) { - flip_num = BKE_object_defgroup_name_index(ob, name_flip); + dg = BLI_findlink(&ob->defbase, defgroup); - if (flip_num != -1) { - map[defgroup] = flip_num; - map[flip_num] = defgroup; - } - } + BLI_string_flip_side_name(name_flip, dg->name, false, sizeof(name_flip)); + if (!STREQ(name_flip, dg->name)) { + flip_num = BKE_object_defgroup_name_index(ob, name_flip); - return map; + if (flip_num != -1) { + map[defgroup] = flip_num; + map[flip_num] = defgroup; + } } + + return map; } int BKE_object_defgroup_flip_index(const Object *ob, int index, const bool use_default) @@ -658,7 +656,7 @@ float BKE_defvert_array_find_weight_safe(const struct MDeformVert *dvert, if (defgroup == -1) { return 1.0f; } - else if (dvert == NULL) { + if (dvert == NULL) { return 0.0f; } @@ -909,10 +907,9 @@ float BKE_defvert_calc_lock_relative_weight(float weight, if (weight != 0.0f) { return 1.0f; } - else { - /* resolve 0/0 to 0 */ - return 0.0f; - } + + /* resolve 0/0 to 0 */ + return 0.0f; } /* non-degenerate division */ |