[Bf-blender-cvs] [bc7627062e2] cycles-x: Merge branch 'master' into cycles-x

[Sergey Sharybin]

Commit: bc7627062e23ae241707d7c17b56f1c71e66de7e
Author: Sergey Sharybin
Date:   Tue Sep 7 10:18:11 2021 +0200
Branches: cycles-x
https://developer.blender.org/rBbc7627062e23ae241707d7c17b56f1c71e66de7e

Merge branch 'master' into cycles-x

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



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

diff --cc intern/cycles/blender/blender_light.cpp
index d842d1cf4a2,542028f4b2f..4df1e720dde
--- a/intern/cycles/blender/blender_light.cpp
+++ b/intern/cycles/blender/blender_light.cpp
@@@ -130,9 -130,15 +129,9 @@@ void BlenderSync::sync_light(BL::Objec
    light->set_cast_shadow(get_boolean(clight, "cast_shadow"));
    light->set_use_mis(get_boolean(clight, "use_multiple_importance_sampling"));
  
 -  int samples = get_int(clight, "samples");
 -  if (get_boolean(cscene, "use_square_samples"))
 -    light->set_samples(samples * samples);
 -  else
 -    light->set_samples(samples);
 -
    light->set_max_bounces(get_int(clight, "max_bounces"));
  
-   if (b_ob != b_ob_instance) {
+   if (b_ob_info.real_object != b_ob_info.iter_object) {
      light->set_random_id(random_id);
    }
    else {
@@@ -148,13 -154,11 +147,13 @@@
      *use_portal = true;
  
    /* visibility */
-   uint visibility = object_ray_visibility(b_ob);
+   uint visibility = object_ray_visibility(b_ob_info.real_object);
 +  light->set_use_camera((visibility & PATH_RAY_CAMERA) != 0);
    light->set_use_diffuse((visibility & PATH_RAY_DIFFUSE) != 0);
    light->set_use_glossy((visibility & PATH_RAY_GLOSSY) != 0);
    light->set_use_transmission((visibility & PATH_RAY_TRANSMIT) != 0);
    light->set_use_scatter((visibility & PATH_RAY_VOLUME_SCATTER) != 0);
-   light->set_is_shadow_catcher(b_ob.is_shadow_catcher());
++  light->set_is_shadow_catcher(b_ob_info.real_object.is_shadow_catcher());
  
    /* tag */
    light->tag_update(scene);