[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20509] branches/soc-2009-jaguarandi/ source/blender/render/intern/source/rayobject.c: Fixed black dot bug! ( it does work for the test case I had)

[André Pinto]

Revision: 20509
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20509
Author:   jaguarandi
Date:     2009-05-29 23:32:52 +0200 (Fri, 29 May 2009)

Log Message:
-----------
Fixed black dot bug! (it does work for the test case I had)
But I still wonder about its correction because it looks the
oposite of whats documented and of what was used before :S

I also took a long time to find it because I tought blender was feeding the raytrace structure
with quads and triangles but it looks the quads get triangulated before reaching makeraytree (on rayshade.c).

Modified Paths:
--------------
    branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c

Modified: branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c	2009-05-29 19:11:04 UTC (rev 20508)
+++ branches/soc-2009-jaguarandi/source/blender/render/intern/source/rayobject.c	2009-05-29 21:32:52 UTC (rev 20509)
@@ -233,8 +233,8 @@
 				if(a->v1==b->v1 || a->v2==b->v1 || a->v3==b->v1 || a->v4==b->v1
 				|| a->v1==b->v2 || a->v2==b->v2 || a->v3==b->v2 || a->v4==b->v2
 				|| a->v1==b->v3 || a->v2==b->v3 || a->v3==b->v3 || a->v4==b->v3
-				|| a->v1==b->v4 || a->v2==b->v4 || a->v3==b->v4 || (a->v4 && a->v4==b->v4))
-				if(!intersection2((VlakRen*)b, -r0, -r1, -r2, is->start[0], is->start[1], is->start[2]))
+				|| (b->v4 && (a->v1==b->v4 || a->v2==b->v4 || a->v3==b->v4 || a->v4==b->v4)))
+				if(intersection2((VlakRen*)b, -r0, -r1, -r2, is->start[0], is->start[1], is->start[2]))
 				{
 					return 0;
 				}