diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
| commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
| tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/nodes/shader/nodes/node_shader_tex_sky.c | |
| parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
| parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) | |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_tex_sky.c')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_sky.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.c b/source/blender/nodes/shader/nodes/node_shader_tex_sky.c index 94ffbbe0c55..9ef05d781bd 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.c @@ -170,7 +170,7 @@ static int node_shader_gpu_tex_sky(GPUMaterial *mat, GPU_uniform(xyz_to_rgb.g), GPU_uniform(xyz_to_rgb.b)); } - else if (tex->sky_model == 1) { + if (tex->sky_model == 1) { /* Hosek / Wilkie */ sun_angles[0] = fmin(M_PI_2, sun_angles[0]); /* clamp to horizon */ SKY_ArHosekSkyModelState *sky_state = SKY_arhosek_xyz_skymodelstate_alloc_init( @@ -210,9 +210,8 @@ static int node_shader_gpu_tex_sky(GPUMaterial *mat, GPU_uniform(xyz_to_rgb.g), GPU_uniform(xyz_to_rgb.b)); } - else { - return GPU_stack_link(mat, node, "node_tex_sky_nishita", in, out); - } + + return GPU_stack_link(mat, node, "node_tex_sky_nishita", in, out); } static void node_shader_update_sky(bNodeTree *UNUSED(ntree), bNode *node) |