[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38139] trunk/blender/source/blender/ render/intern/source/shadeinput.c: Fix #27873: nan pixels in render with degenerate faces.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Jul 6 11:15:19 CEST 2011


Revision: 38139
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38139
Author:   blendix
Date:     2011-07-06 09:15:18 +0000 (Wed, 06 Jul 2011)
Log Message:
-----------
Fix #27873: nan pixels in render with degenerate faces.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/shadeinput.c

Modified: trunk/blender/source/blender/render/intern/source/shadeinput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeinput.c	2011-07-06 08:29:20 UTC (rev 38138)
+++ trunk/blender/source/blender/render/intern/source/shadeinput.c	2011-07-06 09:15:18 UTC (rev 38139)
@@ -771,7 +771,8 @@
 			t00= v3[axis1]-v1[axis1]; t01= v3[axis2]-v1[axis2];
 			t10= v3[axis1]-v2[axis1]; t11= v3[axis2]-v2[axis2];
 
-			detsh= 1.0f/(t00*t11-t10*t01);
+			detsh= (t00*t11-t10*t01);
+			detsh= (detsh != 0.0f)? 1.0f/detsh: 0.0f;
 			t00*= detsh; t01*=detsh; 
 			t10*=detsh; t11*=detsh;
 
@@ -1272,8 +1273,9 @@
 				s11= ho3[1]/ho3[3] - ho2[1]/ho2[3];
 				
 				detsh= s00*s11-s10*s01;
-				s00/= detsh; s01/=detsh; 
-				s10/=detsh; s11/=detsh;
+				detsh= (detsh != 0.0f)? 1.0f/detsh: 0.0f;
+				s00*= detsh; s01*=detsh; 
+				s10*=detsh; s11*=detsh;
 				
 				/* recalc u and v again */
 				hox= x/Zmulx -1.0f;




More information about the Bf-blender-cvs mailing list