Fix for incorrect cutoff points with the haircut cache modifier.

2 files changed, 3 insertions, 9 deletions

diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index 4009a480dc1..411ed78dafa 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -1849,13 +1849,7 @@ static bool haircut_find_segment_cut(HaircutCacheModifier *hmd, HaircutCacheData
 	if ((hmd->cut_mode & eHaircutCacheModifier_CutMode_Enter && is_entering) ||
 	    (hmd->cut_mode & eHaircutCacheModifier_CutMode_Exit && !is_entering))
 	{
-		
-		/* convert back to world space */
-		mul_m4_v3(inst->mat, hit.co);
-		mul_mat3_m4_v3(inst->mat, hit.no);
-		
-		if (r_lambda) *r_lambda = len_v3v3(hit.co, v1) / length;
-		
+		if (r_lambda) *r_lambda = len_v3v3(hit.co, start) / length;
 		return true;
 	}
 	
diff --git a/source/blender/blenkernel/intern/strands.c b/source/blender/blenkernel/intern/strands.c
index bcb12d63c58..40e31c5a867 100644
--- a/source/blender/blenkernel/intern/strands.c
+++ b/source/blender/blenkernel/intern/strands.c
@@ -396,9 +396,9 @@ void BKE_strands_children_deform(StrandsChildren *strands, Strands *parents, boo
 			mul_m4_v3(it_strand.curve->root_matrix, it_vert.vertex->co);
 		}
 		
-		strands_children_apply_cutoff(&it_strand);
-		
 		strands_children_strand_deform_intern(&it_strand, parents, vertstart, use_motion, NULL);
+		
+		strands_children_apply_cutoff(&it_strand);
 	}
 	
 	if (vertstart)