[Bf-blender-cvs] [2d15ed2] temp_merge_gooseberry_hair: Hair grid code was using an invalid hair segment at each hair end with zero vectors, leading to bad density values.

[Lukas Tönne]

Commit: 2d15ed2d9fdc6cfd074f18d6bb5bcf38deec2671
Author: Lukas Tönne
Date:   Fri Nov 14 14:55:56 2014 +0100
Branches: temp_merge_gooseberry_hair
https://developer.blender.org/rB2d15ed2d9fdc6cfd074f18d6bb5bcf38deec2671

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

===================================================================

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 c61f9bc..d85932c 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;
 }