diff options
author | Brecht Van Lommel <brecht@blender.org> | 2020-11-04 18:07:03 +0300 |
---|---|---|
committer | Brecht Van Lommel <brecht@blender.org> | 2020-11-04 18:07:03 +0300 |
commit | b63490bc4bc214853c6af7021ae1000c9cc5c092 (patch) | |
tree | 829f1731d59a50471548e56ce07a570615dcb262 /intern/cycles | |
parent | cf9ea111bf48b500db59f800c49f88544873c4f7 (diff) | |
parent | 4dddd543933ce9d5674b29ff408516022e67d23e (diff) |
Merge branch 'blender-v2.91-release'
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/render/volume.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/render/volume.cpp b/intern/cycles/render/volume.cpp index 4d9bf1df5cb..54ec85a27b3 100644 --- a/intern/cycles/render/volume.cpp +++ b/intern/cycles/render/volume.cpp @@ -438,10 +438,15 @@ static openvdb::GridBase::ConstPtr openvdb_grid_from_device_texture(device_textu image_memory->data_width - 1, image_memory->data_height - 1, image_memory->data_depth - 1); + + typename GridType::Ptr sparse = GridType::create(ValueType(0.0f)); + if (dense_bbox.empty()) { + return sparse; + } + openvdb::tools::Dense<ValueType, openvdb::tools::MemoryLayout::LayoutXYZ> dense( dense_bbox, static_cast<ValueType *>(image_memory->host_pointer)); - typename GridType::Ptr sparse = GridType::create(ValueType(0.0f)); openvdb::tools::copyFromDense(dense, *sparse, ValueType(volume_clipping)); /* #copyFromDense will remove any leaf node that contains constant data and replace it with a |