[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51559] trunk/blender/source/blender/ blenkernel/intern/particle_system.c: Final fix for [#31017] Particles not generated on Grid Distribution

[Janne Karhu]

Revision: 51559
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51559
Author:   jhk
Date:     2012-10-24 01:43:59 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Final fix for [#31017] Particles not generated on Grid Distribution
* In some cases a quad would be intersected twice so particles near this double-intersection point were not generated in grid distribution due to being marked as outside the surface.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2012-10-23 23:54:15 UTC (rev 51558)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2012-10-24 01:43:59 UTC (rev 51559)
@@ -556,8 +556,7 @@
 							else /* store number of intersections */
 								(pa+(int)(lambda*size[a])*a0mul)->hair_index++;
 						}
-						
-						if (mface->v4) {
+						else if (mface->v4) {
 							copy_v3_v3(v4, mvert[mface->v4].co);
 
 							if (isect_axial_line_tri_v3(a, co1, co2, v4, v1, v3, &lambda)) {