diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2014-11-14 16:55:56 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 11:30:07 +0300 |
commit | d73de8f277d82a9d37eceda9de9c70ad80538adf (patch) | |
tree | d49a613a6bea5eb9dc917617e0b7affbcf89d880 /source/blender/physics/intern | |
parent | 95f9726173671ce16a29b0097b8b371004d6750e (diff) |
Hair grid code was using an invalid hair segment at each hair end with
zero vectors, leading to bad density values.
Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp
Diffstat (limited to 'source/blender/physics/intern')
-rw-r--r-- | source/blender/physics/intern/BPH_mass_spring.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index c61f9bce927..d85932c7161 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -621,28 +621,6 @@ static LinkNode *cloth_continuum_add_hair_segments(HairGrid *grid, const float c spring3 ? dir3 : NULL);
}
- /* last segment */
- spring1 = spring2;
- spring2 = spring3;
- spring3 = NULL;
-
- vert3 = vert4;
- vert4 = NULL;
-
- copy_v3_v3(x1, x2); copy_v3_v3(v1, v2);
- copy_v3_v3(x2, x3); copy_v3_v3(v2, v3);
- copy_v3_v3(x3, x4); copy_v3_v3(v3, v4);
- zero_v3(x4); zero_v3(v4);
-
- copy_v3_v3(dir1, dir2);
- copy_v3_v3(dir2, dir3);
- zero_v3(dir3);
-
- BPH_hair_volume_add_segment(grid, x1, v1, x2, v2, x3, v3, x4, v4,
- spring1 ? dir1 : NULL,
- dir2,
- NULL);
-
return next_spring_link;
}
|