[Bf-blender-cvs] [d1bfb48] hair_immediate_fixes: Hair grid code was using an invalid hair segment at each hair end with zero vectors, leading to bad density values.
Lukas Tönne
noreply at git.blender.org
Fri Nov 14 15:11:54 CET 2014
Commit: d1bfb4821640156ad91b673e5d8ae780ebb14e99
Author: Lukas Tönne
Date: Fri Nov 14 14:55:56 2014 +0100
Branches: hair_immediate_fixes
https://developer.blender.org/rBd1bfb4821640156ad91b673e5d8ae780ebb14e99
Hair grid code was using an invalid hair segment at each hair end with
zero vectors, leading to bad density values.
===================================================================
M source/blender/physics/intern/BPH_mass_spring.cpp
===================================================================
diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp
index 61122a1..c4407d2 100644
--- a/source/blender/physics/intern/BPH_mass_spring.cpp
+++ b/source/blender/physics/intern/BPH_mass_spring.cpp
@@ -802,28 +802,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;
}
More information about the Bf-blender-cvs
mailing list