[Bf-blender-cvs] [f172cea484c] blender2.7: Fix T59423: Mesh deform modifier bind bug causing spiky deformations.

mano-wii noreply at git.blender.org
Thu Jan 24 14:34:04 CET 2019


Commit: f172cea484c1f3b4083e7e1574bd33a2c6873f93
Author: mano-wii
Date:   Thu Jan 24 10:32:28 2019 -0200
Branches: blender2.7
https://developer.blender.org/rBf172cea484c1f3b4083e7e1574bd33a2c6873f93

Fix T59423: Mesh deform modifier bind bug causing spiky deformations.

Same as rBac316a6526c7.
(I should have commited in 2.7 first and then merged in 2.8).

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

M	source/blender/editors/armature/meshlaplacian.c

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

diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index 4e31fcc7a11..b42ec77c052 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -898,9 +898,10 @@ static void harmonic_ray_callback(void *userdata, int index, const BVHTreeRay *r
 	face[1] = mdb->cagecos[mloop[lt->tri[1]].v];
 	face[2] = mdb->cagecos[mloop[lt->tri[2]].v];
 
-	if (!isect_ray_tri_watertight_v3(
-	        ray->origin, ray->isect_precalc, UNPACK3(face), &dist, NULL))
-	{
+	bool isect_ray_tri = isect_ray_tri_watertight_v3(
+	        ray->origin, ray->isect_precalc, UNPACK3(face), &dist, NULL);
+
+	if (!isect_ray_tri || dist > isec->vec_length) {
 		return;
 	}



More information about the Bf-blender-cvs mailing list