diff options
| author | Sergey Sharybin <sergey@blender.org> | 2021-05-27 12:11:49 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2021-05-27 12:36:30 +0300 |
| commit | 15df83e9c910f620e4d1ab24f7175c7a2eae57b3 (patch) | |
| tree | 31f1566429bd2180f0fb72528d6ddc0be2a515c5 /intern | |
| parent | 8f43e31a7195b35b73d662775b4105a880d52a57 (diff) | |
Cleanup: Use logical OR in Cycles background shader
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 736c10e8881..bad7fee3032 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -1501,7 +1501,7 @@ void BlenderSync::sync_world(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d, background->set_transparent_roughness_threshold(0.0f); } - background->set_use_shader(view_layer.use_background_shader | + background->set_use_shader(view_layer.use_background_shader || viewport_parameters.custom_viewport_parameters()); background->set_use_ao(background->get_use_ao() && view_layer.use_background_ao); |