diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 19:04:40 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-03 19:18:16 +0300 |
commit | d2db481dc70bba7b5ca2c3bf01e8748155fcefad (patch) | |
tree | c587f36b76c075bd3ecb4be48104fe1ce82d5e15 /source/blender/blenkernel/intern/armature_deform.c | |
parent | a21cb22f8b12ea73937e7e6eda8465f1cba02b6e (diff) |
Cleanup: Blendkernel, Clang-Tidy else-after-return fixes (incomplete)
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/blenkernel` module. Not all warnings are
addressed in this commit.
No functional changes.
Diffstat (limited to 'source/blender/blenkernel/intern/armature_deform.c')
-rw-r--r-- | source/blender/blenkernel/intern/armature_deform.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/armature_deform.c b/source/blender/blenkernel/intern/armature_deform.c index 44b50ab96d3..8711a001e32 100644 --- a/source/blender/blenkernel/intern/armature_deform.c +++ b/source/blender/blenkernel/intern/armature_deform.c @@ -163,17 +163,15 @@ float distfactor_to_bone( if (dist_sq < a) { return 1.0f; } - else { - l = rad + rdist; - l *= l; - if (rdist == 0.0f || dist_sq >= l) { - return 0.0f; - } - else { - a = sqrtf(dist_sq) - rad; - return 1.0f - (a * a) / (rdist * rdist); - } + + l = rad + rdist; + l *= l; + if (rdist == 0.0f || dist_sq >= l) { + return 0.0f; } + + a = sqrtf(dist_sq) - rad; + return 1.0f - (a * a) / (rdist * rdist); } static float dist_bone_deform( |