[Bf-blender-cvs] [5b6a3a57fbf] master: Merge branch 'blender-v2.92-release'

[Brecht Van Lommel]

Commit: 5b6a3a57fbf625efe306e0a1b17e7a553e850074
Author: Brecht Van Lommel
Date:   Wed Feb 17 15:56:24 2021 +0100
Branches: master
https://developer.blender.org/rB5b6a3a57fbf625efe306e0a1b17e7a553e850074

Merge branch 'blender-v2.92-release'

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



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

diff --cc intern/cycles/render/geometry.cpp
index 575042360aa,74907292943..2c2b987e5c0
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@@ -240,7 -241,9 +241,8 @@@ void Geometry::compute_bvh
      }
    }
  
 -  clear_modified();
    need_update_rebuild = false;
+   need_update_bvh_for_offset = false;
  }
  
  bool Geometry::has_motion_blur() const
@@@ -1923,8 -1637,7 +1928,8 @@@ void GeometryManager::device_update(Dev
  
      size_t i = 0;
      foreach (Geometry *geom, scene->geometry) {
-       if (geom->is_modified()) {
+       if (geom->is_modified() || geom->need_update_bvh_for_offset) {
 +        need_update_scene_bvh = true;
          pool.push(function_bind(
              &Geometry::compute_bvh, geom, device, dscene, &scene->params, &progress, i, num_bvh));
          if (geom->need_build_bvh(bvh_layout)) {