Fixed bug in media photons.

c-lipka · c-lipka · commit 5b5e312523b2 · 2016-02-28T10:34:58.000+01:00
diff --git a/source/base/version.h b/source/base/version.h
@@ -45,7 +45,7 @@
 #define OFFICIAL_VERSION_STRING "3.7.1"
 #define OFFICIAL_VERSION_NUMBER 371
 
-#define POV_RAY_PRERELEASE "alpha.8498421"
+#define POV_RAY_PRERELEASE "alpha.8499454"
 
 #if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
 #ifdef POV_RAY_PRERELEASE
diff --git a/source/core/lighting/photons.cpp b/source/core/lighting/photons.cpp
@@ -1169,7 +1169,10 @@ void PhotonMediaFunction::DepositMediaPhotons(MathColour& colour, MediaVector& m
     {
         // Add optical depth of current interval.
 
-        Od += (*i).od / (DBL)(*i).samples;
+        if ((*i).samples > 0)
+            Od += (*i).od / (DBL)(*i).samples;
+        else
+            POV_ASSERT((*i).od.IsZero());
     }
 
     // Add contribution estimated for the participating media.
diff --git a/unix/VERSION b/unix/VERSION
@@ -1 +1 @@
-3.7.1-alpha.8498421
+3.7.1-alpha.8499454

Original file line number	Diff line number	Diff line change
`@@ -1169,7 +1169,10 @@ void PhotonMediaFunction::DepositMediaPhotons(MathColour& colour, MediaVector& m`
`1169`	`1169`	`{`
`1170`	`1170`	`// Add optical depth of current interval.`
`1171`	`1171`
`1172`		`- Od += (i).od / (DBL)(i).samples;`
	`1172`	`+ if ((*i).samples > 0)`
	`1173`	`+ Od += (i).od / (DBL)(i).samples;`
	`1174`	`+ else`
	`1175`	`+ POV_ASSERT((*i).od.IsZero());`
`1173`	`1176`	`}`
`1174`	`1177`
`1175`	`1178`	`// Add contribution estimated for the participating media.`