[Bf-blender-cvs] [1a7e7b1] openvdb: Cycles: fix crash when rendering a volume with non-uniform voxels.
Kévin Dietrich
noreply at git.blender.org
Mon Jan 25 11:03:43 CET 2016
Commit: 1a7e7b14b4069d6b065de5dce64391bc5cee4d1a
Author: Kévin Dietrich
Date: Mon Jan 25 07:15:55 2016 +0100
Branches: openvdb
https://developer.blender.org/rB1a7e7b14b4069d6b065de5dce64391bc5cee4d1a
Cycles: fix crash when rendering a volume with non-uniform voxels.
===================================================================
M intern/cycles/util/util_volume.cpp
===================================================================
diff --git a/intern/cycles/util/util_volume.cpp b/intern/cycles/util/util_volume.cpp
index 88293f5..b5fca18 100644
--- a/intern/cycles/util/util_volume.cpp
+++ b/intern/cycles/util/util_volume.cpp
@@ -112,7 +112,10 @@ vdb_float_volume::~vdb_float_volume()
void vdb_float_volume::create_threads_utils(const vector<pthread_t> &thread_ids)
{
- create_isectors_threads(isectors, thread_ids, *main_isector);
+ if (uniform_voxels) {
+ create_isectors_threads(isectors, thread_ids, *main_isector);
+ }
+
create_samplers_threads(point_samplers, accessors, thread_ids, transform, *accessor);
create_samplers_threads(box_samplers, accessors, thread_ids, transform, *accessor);
}
@@ -158,7 +161,10 @@ vdb_float3_volume::~vdb_float3_volume()
void vdb_float3_volume::create_threads_utils(const vector<pthread_t> &thread_ids)
{
- create_isectors_threads(isectors, thread_ids, *main_isector);
+ if (uniform_voxels) {
+ create_isectors_threads(isectors, thread_ids, *main_isector);
+ }
+
create_samplers_threads(point_samplers, accessors, thread_ids, transform, *accessor);
create_samplers_threads(box_samplers, accessors, thread_ids, transform, *accessor);
create_samplers_threads(stag_point_samplers, accessors, thread_ids, transform, *accessor);
More information about the Bf-blender-cvs
mailing list