[Bf-blender-cvs] [1aa93dd] master: Cycles: Cleanup after recent changes

[Sergey Sharybin]

Commit: 1aa93dd9fd84b74945ab6a3644764393557e30b9
Author: Sergey Sharybin
Date:   Tue Feb 17 23:21:41 2015 +0500
Branches: master
https://developer.blender.org/rB1aa93dd9fd84b74945ab6a3644764393557e30b9

Cycles: Cleanup after recent changes

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

M	intern/cycles/kernel/kernel_light.h

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

diff --git a/intern/cycles/kernel/kernel_light.h b/intern/cycles/kernel/kernel_light.h
index afc5965..0be8a9e 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -175,10 +175,10 @@ ccl_device float3 sphere_light_sample(float3 P, float3 center, float radius, flo
  * https://www.solidangle.com/research/egsr2013_spherical_rectangle.pdf
  */
 ccl_device float area_light_sample(float3 P,
-                                    float3 *light_p,
-                                    float3 axisu, float3 axisv,
-                                    float randu, float randv,
-                                    bool return_coord)
+                                   float3 *light_p,
+                                   float3 axisu, float3 axisv,
+                                   float randu, float randv,
+                                   bool sample_coord)
 {
 	/* In our name system we're using P for the center,
 	 * which is o in the paper.
@@ -225,7 +225,7 @@ ccl_device float area_light_sample(float3 P,
 	/* Compute solid angle from internal angles. */
 	float S = g0 + g1 - k;
 
-	if(return_coord) {
+	if(sample_coord) {
 		/* Compute cu. */
 		float au = randu * S + k;
 		float fu = (cosf(au) * b0 - b1) / sinf(au);