[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46439] trunk/blender/intern/dualcon/ intern/Projections.h: Fix division by zero case in dualcon.

[Nicholas Bishop]

Revision: 46439
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46439
Author:   nicholasbishop
Date:     2012-05-08 22:11:16 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Fix division by zero case in dualcon.

Modified Paths:
--------------
    trunk/blender/intern/dualcon/intern/Projections.h

Modified: trunk/blender/intern/dualcon/intern/Projections.h
===================================================================
--- trunk/blender/intern/dualcon/intern/Projections.h	2012-05-08 22:11:05 UTC (rev 46438)
+++ trunk/blender/intern/dualcon/intern/Projections.h	2012-05-08 22:11:16 UTC (rev 46439)
@@ -783,20 +783,18 @@
 	LONG proj0 = cubeProj[i][0];
 	LONG proj1 = cubeProj[i][0] + cubeProj[i][edgeInd + 1];
 	LONG proj2 = inherit->trigProj[i][1];
+	LONG d = proj1 - proj0;
+	double alpha;
 
-	// double alpha = (double)( ( proj2 - proj0 ) * cubeProj[edgeInd][edgeInd + 1] ) / (double)( proj1 - proj0 ) ;
-	double alpha = (double)( (proj2 - proj0) ) / (double)(proj1 - proj0);
-
-	if (alpha < 0)
-	{
+	if (d == 0)
 		alpha = 0.5;
+	else {
+		alpha = (double)((proj2 - proj0)) / (double)d;
+
+		if (alpha < 0 || alpha > 1)
+			alpha = 0.5;
 	}
-	else if (alpha > 1)
-	{
-		alpha = 0.5;
-	}
 
-
 	return (float)alpha;
 };