diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-16 06:56:03 +0300 |
commit | 873a87c7e8f96e3f6785d90144182356b3fef7cd (patch) | |
tree | 590281363041582f796770466b0f898e4e905fbd /source/blender/render | |
parent | 1e9bc60777421b861852f9289d1ca71a69bedc3f (diff) | |
parent | e428ea3e0055dd95445694a72ff5c6b491a46ec7 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/convertblender.c | 13 | ||||
-rw-r--r-- | source/blender/render/intern/source/pixelshading.c | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index fc60c70c2c4..19a87784ad4 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -3798,12 +3798,13 @@ static GroupObject *add_render_lamp(Render *re, Object *ob) copy_v3_v3(vec, ob->obmat[2]); normalize_v3(vec); - InitSunSky(lar->sunsky, la->atm_turbidity, vec, la->horizon_brightness, - la->spread, la->sun_brightness, la->sun_size, la->backscattered_light, - la->skyblendfac, la->skyblendtype, la->sky_exposure, la->sky_colorspace); - - InitAtmosphere(lar->sunsky, la->sun_intensity, 1.0, 1.0, la->atm_inscattering_factor, la->atm_extinction_factor, - la->atm_distance_factor); + InitSunSky( + lar->sunsky, la->atm_turbidity, vec, la->horizon_brightness, + la->spread, la->sun_brightness, la->sun_size, la->backscattered_light, + la->skyblendfac, la->skyblendtype, la->sky_exposure, la->sky_colorspace); + InitAtmosphere( + lar->sunsky, la->sun_intensity, 1.0, 1.0, la->atm_inscattering_factor, la->atm_extinction_factor, + la->atm_distance_factor); } } else lar->ray_totsamp= 0; diff --git a/source/blender/render/intern/source/pixelshading.c b/source/blender/render/intern/source/pixelshading.c index 97d6b060e0a..ddbdb35bf51 100644 --- a/source/blender/render/intern/source/pixelshading.c +++ b/source/blender/render/intern/source/pixelshading.c @@ -576,7 +576,7 @@ void shadeSunView(float col_r[3], const float view[3]) GetSkyXYZRadiancef(lar->sunsky, sview, colorxyz); xyz_to_rgb(colorxyz[0], colorxyz[1], colorxyz[2], &sun_collector[0], &sun_collector[1], &sun_collector[2], - lar->sunsky->sky_colorspace); + lar->sunsky->sky_colorspace); ramp_blend(lar->sunsky->skyblendtype, col_r, lar->sunsky->skyblendfac, sun_collector); } |