[Bf-blender-cvs] [9c87f0f] alembic: Fix for the hair strands cutting modifier for caches.

Lukas Tönne noreply at git.blender.org
Wed May 27 16:47:36 CEST 2015


Commit: 9c87f0f2c85598e2831550df4ed05c23d82f4f19
Author: Lukas Tönne
Date:   Wed May 27 16:46:23 2015 +0200
Branches: alembic
https://developer.blender.org/rB9c87f0f2c85598e2831550df4ed05c23d82f4f19

Fix for the hair strands cutting modifier for caches.

The cutoff value was off by 1.0, due to an invalid increment for the
first vertex.

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

M	source/blender/blenkernel/intern/cache_library.c

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

diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index 46cc2aa..2fe0e8f 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -1864,12 +1864,14 @@ static bool haircut_find_first_strand_cut(HaircutCacheModifier *hmd, HaircutCach
 			}
 			
 			if (found_cut) {
-				if (r_cutoff) *r_cutoff = cutoff + lambda_min;
+				cutoff += lambda_min;
+				if (r_cutoff) *r_cutoff = cutoff;
 				return true;
 			}
+			else
+				cutoff += 1.0f;
 		}
 		
-		cutoff += 1.0f;
 		vprev = it_vert.index;
 	}




More information about the Bf-blender-cvs mailing list