[Bf-blender-cvs] [874c70d0881] blender-v2.93-release: Fix errors in Cycles comments

Brecht Van Lommel noreply at git.blender.org
Mon May 3 22:46:36 CEST 2021


Commit: 874c70d088136f8e1d8c3fc00b6fc69f4e3c2784
Author: Brecht Van Lommel
Date:   Mon May 3 22:44:22 2021 +0200
Branches: blender-v2.93-release
https://developer.blender.org/rB874c70d088136f8e1d8c3fc00b6fc69f4e3c2784

Fix errors in Cycles comments

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

M	intern/cycles/kernel/kernel_subsurface.h
M	intern/cycles/render/light.cpp

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

diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 0a56f867158..b70df747a73 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -606,10 +606,10 @@ ccl_device_noinline
       t = ray->t;
     }
     else if (bounce == 0) {
-      /* Restore original position if nothing was hit after the first bounce.
-       * Otherwise if the ray_offset() to avoid self-intersection is relatively
-       * large compared to the scattering radius, we go never backup high enough
-       * to exit the surface. */
+      /* Restore original position if nothing was hit after the first bounce,
+       * without the ray_offset() that was added to avoid self-intersection.
+       * Otherwise if that offset is relatively large compared to the scattering
+       * radius, we never go back up high enough to exit the surface. */
       ray->P = sd->P;
     }
 
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index 858b177b69c..a069b850512 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -864,7 +864,7 @@ void LightManager::device_update_points(Device *, DeviceScene *dscene, Scene *sc
       const float min_spread_angle = 1.0f * M_PI_F / 180.0f;
       const float spread_angle = 0.5f * (M_PI_F - max(light->spread, min_spread_angle));
       /* Normalization computed using:
-       * integrate cos(x) (1 - tan(x) * tan(a)) * sin(x) from x = a to pi/2. */
+       * integrate cos(x) * (1 - tan(x) * tan(a)) * sin(x) from x = 0 to pi/2 - a. */
       const float tan_spread = tanf(spread_angle);
       const float normalize_spread = 2.0f / (2.0f + (2.0f * spread_angle - M_PI_F) * tan_spread);



More information about the Bf-blender-cvs mailing list