Clean up. Change VDB iteration method in Cycles to leaf iterators rather than accessors.

1 files changed, 15 insertions, 11 deletions

diff --git a/intern/cycles/render/openvdb.h b/intern/cycles/render/openvdb.h
index 06e404059d6..37657800372 100644
--- a/intern/cycles/render/openvdb.h
+++ b/intern/cycles/render/openvdb.h
@@ -20,15 +20,18 @@ device_memory *openvdb_load_device_extern(Device *device,
                                           const ExtensionType& extension,
                                           const bool is_vec);
 
-bool openvdb_load_sparse(const string& filepath,
-                         const string& grid_name,
-                         const int channels,
-                         const float threshold,
-                         vector<float> *sparse_grid,
-                         vector<int> *grid_info);
-
-bool openvdb_load_dense(const string& filepath, const string& grid_name,
-                        float *data, const int channels);
+void openvdb_load_preprocess(const string& filepath,
+                             const string& grid_name,
+                             const int channels,
+                             const float threshold,
+                             vector<int> *sparse_index,
+                             int &sparse_size);
+
+void openvdb_load_image(const string& filepath,
+                        const string& grid_name,
+                        const int channels,
+                        float *image,
+                        vector<int> *sparse_index);
 
 device_memory *openvdb_load_device_intern(Device *device,
                                           const float *data,
@@ -38,8 +41,9 @@ device_memory *openvdb_load_device_intern(Device *device,
                                           const ExtensionType& extension,
                                           const bool is_vec);
 
-void openvdb_build_mesh(VolumeMeshBuilder *builder, void *v_accessor,
-                        const int3 resolution, const float threshold,
+void openvdb_build_mesh(VolumeMeshBuilder *builder,
+                        void *v_grid,
+                        const float threshold,
                         const bool is_vec);
 
 CCL_NAMESPACE_END