[Bf-blender-cvs] [a650d188210] cycles_texture_cache: Fix errors in Cycles comments
Brecht Van Lommel
noreply at git.blender.org
Thu May 6 11:25:39 CEST 2021
Commit: a650d188210e91016fc262530d1892124d30143f
Author: Brecht Van Lommel
Date: Mon May 3 22:44:22 2021 +0200
Branches: cycles_texture_cache
https://developer.blender.org/rBa650d188210e91016fc262530d1892124d30143f
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 678bbf8be3e..e40f051f933 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -607,10 +607,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 9b975daff0b..5290d68e75a 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -865,7 +865,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