[Bf-blender-cvs] [7377b36660f] blender-v2.79a-release: Fix copy-paste error in recent particles fix

Sergey Sharybin noreply at git.blender.org
Mon Jan 8 16:55:24 CET 2018


Commit: 7377b36660f216c2e610101918feaa217f257550
Author: Sergey Sharybin
Date:   Fri Sep 15 11:35:00 2017 +0500
Branches: blender-v2.79a-release
https://developer.blender.org/rB7377b36660f216c2e610101918feaa217f257550

Fix copy-paste error in recent particles fix

Was intersecting same triangle twice.

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

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

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

diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c
index bcef6c2ace0..e8f7437ecee 100644
--- a/source/blender/blenkernel/intern/particle_distribute.c
+++ b/source/blender/blenkernel/intern/particle_distribute.c
@@ -242,7 +242,7 @@ static void distribute_grid(DerivedMesh *dm, ParticleSystem *psys)
 
 							if (isect_ray_tri_watertight_v3(co1,
 							                                &isect_precalc,
-							                                v1, v2, v3,
+							                                v1, v3, v4,
 							                                &lambda, NULL)) {
 								if (from==PART_FROM_FACE)
 									(pa+(int)(lambda*size[a])*a0mul)->flag &= ~PARS_UNEXIST;



More information about the Bf-blender-cvs mailing list