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:
authorSybren A. Stüvel <sybren@blender.org>2020-08-07 14:37:22 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-08-07 14:38:07 +0300
commitc04088fed1b8faea6b2928bb5e09ab367076950c (patch)
treef4aed4491f5af44dade7d84a52901a56fd6dddd7 /source/blender/simulation/intern/implicit_blender.c
parent3d48d99647b59a6f0461baa4456660917f1bbda6 (diff)
Cleanup: Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return` rule. This should be the final commit of the series of commits that addresses this particular rule. No functional changes.
Diffstat (limited to 'source/blender/simulation/intern/implicit_blender.c')
-rw-r--r--source/blender/simulation/intern/implicit_blender.c20
1 files changed, 8 insertions, 12 deletions
diff --git a/source/blender/simulation/intern/implicit_blender.c b/source/blender/simulation/intern/implicit_blender.c
index 856572aa3f5..1f6e67cb9ac 100644
--- a/source/blender/simulation/intern/implicit_blender.c
+++ b/source/blender/simulation/intern/implicit_blender.c
@@ -1711,9 +1711,8 @@ BLI_INLINE float fbstar(float length, float L, float kb, float cb)
if (tempfb_fl < fbstar_fl) {
return fbstar_fl;
}
- else {
- return tempfb_fl;
- }
+
+ return tempfb_fl;
}
// function to calculae bending spring force (taken from Choi & Co)
@@ -1725,9 +1724,8 @@ BLI_INLINE float fbstar_jacobi(float length, float L, float kb, float cb)
if (tempfb_fl < fbstar_fl) {
return -cb;
}
- else {
- return -kb * fbderiv(length, L);
- }
+
+ return -kb * fbderiv(length, L);
}
/* calculate elonglation */
@@ -1864,9 +1862,8 @@ bool SIM_mass_spring_force_spring_bending(
return true;
}
- else {
- return false;
- }
+
+ return false;
}
BLI_INLINE void poly_avg(lfVector *data, const int *inds, int len, float r_avg[3])
@@ -2352,9 +2349,8 @@ bool SIM_mass_spring_force_spring_goal(Implicit_Data *data,
return true;
}
- else {
- return false;
- }
+
+ return false;
}
#endif /* IMPLICIT_SOLVER_BLENDER */