[Bf-blender-cvs] [ddeb8c5] master: Cleanup: Fix a typo in world MIS.

Thomas Dinges noreply at git.blender.org
Fri Jun 26 21:37:40 CEST 2015


Commit: ddeb8c595fa32a6d5a68614a6821a607398f86e8
Author: Thomas Dinges
Date:   Fri Jun 26 21:36:28 2015 +0200
Branches: master
https://developer.blender.org/rBddeb8c595fa32a6d5a68614a6821a607398f86e8

Cleanup: Fix a typo in world MIS.

Found by Lukas Stockner, thanks!

===================================================================

M	intern/cycles/render/light.cpp

===================================================================

diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index 1b7aa0e..448bbc9 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -421,16 +421,16 @@ static void background_cdf(int start,
 	for(int i = start; i < end; i++) {
 		float sin_theta = sinf(M_PI_F * (i + 0.5f) / res);
 		float3 env_color = (*pixels)[i * res];
-		float ave_luminamce = average(env_color);
+		float ave_luminance = average(env_color);
 
-		cond_cdf[i * cdf_count].x = ave_luminamce * sin_theta;
+		cond_cdf[i * cdf_count].x = ave_luminance * sin_theta;
 		cond_cdf[i * cdf_count].y = 0.0f;
 
 		for(int j = 1; j < res; j++) {
 			env_color = (*pixels)[i * res + j];
-			ave_luminamce = average(env_color);
+			ave_luminance = average(env_color);
 
-			cond_cdf[i * cdf_count + j].x = ave_luminamce * sin_theta;
+			cond_cdf[i * cdf_count + j].x = ave_luminance * sin_theta;
 			cond_cdf[i * cdf_count + j].y = cond_cdf[i * cdf_count + j - 1].y + cond_cdf[i * cdf_count + j - 1].x / res;
 		}




More information about the Bf-blender-cvs mailing list