[Bf-blender-cvs] [72a46d5e7fa] cycles_procedural_api: Merge branch 'master' into cycles_procedural_api

[Kévin Dietrich]

Commit: 72a46d5e7faef84d5eccec3a302ca5c22863a776
Author: Kévin Dietrich
Date:   Tue Oct 13 08:31:59 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB72a46d5e7faef84d5eccec3a302ca5c22863a776

Merge branch 'master' into cycles_procedural_api

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



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

diff --cc intern/cycles/render/geometry.cpp
index d1e23ac66e5,455959512fd..4359956bb73
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@@ -1247,7 -1129,7 +1247,7 @@@ void GeometryManager::device_update_pre
        }
      }
  
-     if (need_update && geom->geometry_type == Geometry::VOLUME) {
 -    if (geom->need_update_rebuild && geom->type == Geometry::VOLUME) {
++    if (geom->need_update_rebuild && geom->geometry_type == Geometry::VOLUME) {
        /* Create volume meshes if there is voxel data. */
        if (!volume_images_updated) {
          progress.set_status("Updating Meshes Volume Bounds");