diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:41:46 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-24 18:42:52 +0300 |
commit | 253dce07d7cccb769d34356fc34c5900f7cd0ec8 (patch) | |
tree | e4018aaa2b89340d7d2e08cdbcba8ea3ff40b0cc /source/blender/physics/intern/BPH_mass_spring.cpp | |
parent | fe52a05e950e474036c80f554a4675f12203695b (diff) | |
parent | 0cff044d84646c2890f13b8915eb708861bb36d6 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/physics/intern/BPH_mass_spring.cpp')
-rw-r--r-- | source/blender/physics/intern/BPH_mass_spring.cpp | 2 |
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 c098cfd8d95..d94f2094f81 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -593,7 +593,7 @@ BLI_INLINE void cloth_get_grid_location(Implicit_Data *data, float cell_scale, c add_v3_v3(x, cell_offset); } -/* returns next spring forming a continous hair sequence */ +/* returns next spring forming a continuous hair sequence */ BLI_INLINE LinkNode *hair_spring_next(LinkNode *spring_link) { ClothSpring *spring = (ClothSpring *)spring_link->link; |