[Bf-blender-cvs] [af2ae46] openvdb: Use multithreading when doing an export.

Kévin Dietrich noreply at git.blender.org
Fri Jun 5 22:25:02 CEST 2015


Commit: af2ae46fbb20d0376e3470566ce6599913f3dd3b
Author: Kévin Dietrich
Date:   Fri Jun 5 17:46:14 2015 +0200
Branches: openvdb
https://developer.blender.org/rBaf2ae46fbb20d0376e3470566ce6599913f3dd3b

Use multithreading when doing an export.

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

M	intern/openvdb/intern/openvdb_dense_convert.cpp
M	intern/openvdb/intern/openvdb_dense_convert.h

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

diff --git a/intern/openvdb/intern/openvdb_dense_convert.cpp b/intern/openvdb/intern/openvdb_dense_convert.cpp
index 340629f..0652f03 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.cpp
+++ b/intern/openvdb/intern/openvdb_dense_convert.cpp
@@ -86,15 +86,15 @@ GridBase *OpenVDB_export_vector_grid(OpenVDBWriter *writer,
 
 	grid[0] = FloatGrid::create(0.0f);
 	tools::Dense<const float, tools::LayoutXYZ> dense_grid_x(bbox, data_x);
-	tools::copyFromDense(dense_grid_x, grid[0]->tree(), 1e-3f, true);
+	tools::copyFromDense(dense_grid_x, grid[0]->tree(), 1e-3f);
 
 	grid[1] = FloatGrid::create(0.0f);
 	tools::Dense<const float, tools::LayoutXYZ> dense_grid_y(bbox, data_y);
-	tools::copyFromDense(dense_grid_y, grid[1]->tree(), 1e-3f, true);
+	tools::copyFromDense(dense_grid_y, grid[1]->tree(), 1e-3f);
 
 	grid[2] = FloatGrid::create(0.0f);
 	tools::Dense<const float, tools::LayoutXYZ> dense_grid_z(bbox, data_z);
-	tools::copyFromDense(dense_grid_z, grid[2]->tree(), 1e-3f, true);
+	tools::copyFromDense(dense_grid_z, grid[2]->tree(), 1e-3f);
 
 	Vec3SGrid::Ptr vecgrid = Vec3SGrid::create(Vec3s(0.0f));
 
diff --git a/intern/openvdb/intern/openvdb_dense_convert.h b/intern/openvdb/intern/openvdb_dense_convert.h
index 2cf3090..9d215ad 100644
--- a/intern/openvdb/intern/openvdb_dense_convert.h
+++ b/intern/openvdb/intern/openvdb_dense_convert.h
@@ -60,7 +60,7 @@ GridType *OpenVDB_export_grid(OpenVDBWriter *writer,
 	typename GridType::Ptr grid = GridType::create(T(0));
 
 	tools::Dense<const T, openvdb::tools::LayoutXYZ> dense_grid(bbox, data);
-	tools::copyFromDense(dense_grid, grid->tree(), 1e-3f, true);
+	tools::copyFromDense(dense_grid, grid->tree(), 1e-3f);
 
 	if (mask) {
 		grid = tools::clip(*grid, *mask);




More information about the Bf-blender-cvs mailing list