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:
authorJulian Eisel <eiseljulian@gmail.com>2019-08-10 14:24:26 +0300
committerJulian Eisel <eiseljulian@gmail.com>2019-08-10 14:24:26 +0300
commitb9898ebde44d6584ea37a05aaeca8760d31ccc7b (patch)
treee6dfc796cc82b4b8b8c248c4ff29d2e2047ff84c /source/blender/physics/intern/BPH_mass_spring.cpp
parentb17380971a144896b34b7863a82bbda3ff68a39f (diff)
parent553b581f25c1782c4231816965cd3f6ce58a449a (diff)
Merge branch 'master' into filebrowser_redesign
Diffstat (limited to 'source/blender/physics/intern/BPH_mass_spring.cpp')
-rw-r--r--source/blender/physics/intern/BPH_mass_spring.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index bc404110008..95c16c2f033 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -393,7 +393,7 @@ BLI_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s)
if (s->type & CLOTH_SPRING_TYPE_SEWING) {
/* TODO: verify, half verified (couldn't see error)
* sewing springs usually have a large distance at first so clamp the force so we don't get
- * tunnelling through colission objects */
+ * tunnelling through collision objects. */
BPH_mass_spring_force_spring_linear(data,
s->ij,
s->kl,