Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2020-08-10 19:30:53 +0300
committerJulian Eisel <julian@blender.org>2020-08-10 19:30:53 +0300
commit784adccf470b6ccea30d8ee63fdcd5aa8dd4326c (patch)
tree6c828af0c9905a76300ce9e3c23e82e961f49cd3 /intern/sky
parentc521b69ffb68df17d6b8e1c71d23924a8b9b9cf3 (diff)
parent8ef05d3180b1b54c7647d059a1f8a6c610937bc9 (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'intern/sky')
-rw-r--r--intern/sky/source/sky_model.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/intern/sky/source/sky_model.cpp b/intern/sky/source/sky_model.cpp
index 64cf14ec030..e835e04d164 100644
--- a/intern/sky/source/sky_model.cpp
+++ b/intern/sky/source/sky_model.cpp
@@ -178,8 +178,9 @@ static void ArHosekSkyModel_CookConfiguration(ArHosekSkyModel_Dataset dataset,
pow(solar_elevation, 5.0) * elev_matrix[i + 45]);
}
- if (int_turbidity == 10)
+ if (int_turbidity == 10) {
return;
+ }
// alb 0 high turb
elev_matrix = dataset + (9 * 6 * (int_turbidity));
@@ -243,8 +244,9 @@ static double ArHosekSkyModel_CookRadianceConfiguration(ArHosekSkyModel_Radiance
10.0 * pow(1.0 - solar_elevation, 2.0) * pow(solar_elevation, 3.0) * elev_matrix[3] +
5.0 * (1.0 - solar_elevation) * pow(solar_elevation, 4.0) * elev_matrix[4] +
pow(solar_elevation, 5.0) * elev_matrix[5]);
- if (int_turbidity == 10)
+ if (int_turbidity == 10) {
return res;
+ }
// alb 0 high turb
elev_matrix = dataset + (6 * (int_turbidity));
@@ -298,16 +300,18 @@ double SKY_arhosekskymodel_radiance(SKY_ArHosekSkyModelState *state,
{
int low_wl = (int)((wavelength - 320.0) / 40.0);
- if (low_wl < 0 || low_wl >= 11)
+ if (low_wl < 0 || low_wl >= 11) {
return 0.0;
+ }
double interp = fmod((wavelength - 320.0) / 40.0, 1.0);
double val_low = ArHosekSkyModel_GetRadianceInternal(state->configs[low_wl], theta, gamma) *
state->radiances[low_wl] * state->emission_correction_factor_sky[low_wl];
- if (interp < 1e-6)
+ if (interp < 1e-6) {
return val_low;
+ }
double result = (1.0 - interp) * val_low;