[Bf-blender-cvs] [15df83e9c91] master: Cleanup: Use logical OR in Cycles background shader

[Sergey Sharybin]

Commit: 15df83e9c910f620e4d1ab24f7175c7a2eae57b3
Author: Sergey Sharybin
Date:   Thu May 27 11:11:49 2021 +0200
Branches: master
https://developer.blender.org/rB15df83e9c910f620e4d1ab24f7175c7a2eae57b3

Cleanup: Use logical OR in Cycles background shader

===================================================================

M	intern/cycles/blender/blender_shader.cpp

===================================================================

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);