[Bf-blender-cvs] [e4126ec] openvdb: Gooseberry: Fix compilation error with OpenVDB disabled

Sergey Sharybin noreply at git.blender.org
Thu Jun 11 12:28:55 CEST 2015


Commit: e4126ec9c13be21e454622cb52787ab4c392e3bd
Author: Sergey Sharybin
Date:   Thu Jun 11 11:55:45 2015 +0200
Branches: openvdb
https://developer.blender.org/rBe4126ec9c13be21e454622cb52787ab4c392e3bd

Gooseberry: Fix compilation error with OpenVDB disabled

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

M	intern/cycles/render/openvdb.cpp
M	source/blender/blenkernel/intern/smoke.c

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

diff --git a/intern/cycles/render/openvdb.cpp b/intern/cycles/render/openvdb.cpp
index eb4a96d..13d8722 100644
--- a/intern/cycles/render/openvdb.cpp
+++ b/intern/cycles/render/openvdb.cpp
@@ -25,6 +25,7 @@ CCL_NAMESPACE_BEGIN
 
 VolumeManager::VolumeManager()
 {
+#ifdef WITH_OPENVDB
 	openvdb::initialize();
 
 	scalar_grids.reserve(64);
@@ -32,25 +33,28 @@ VolumeManager::VolumeManager()
 	current_grids.reserve(64);
 	float_volumes.reserve(64);
 	float3_volumes.reserve(64);
+#endif
 
 	need_update = true;
 }
 
 VolumeManager::~VolumeManager()
 {
+#ifdef WITH_OPENVDB
 	scalar_grids.clear();
 	vector_grids.clear();
 	current_grids.clear();
 	float_volumes.clear();
 	float3_volumes.clear();
+#endif
 }
 
 static inline void catch_exceptions()
 {
+#ifdef WITH_OPENVDB
 	try {
 		throw;
 	}
-#ifdef WITH_OPENVDB
 	catch (const openvdb::IoError& e) {
 		std::cerr << e.what() << "\n";
 	}
@@ -238,6 +242,7 @@ void VolumeManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
 	VLOG(1) << "Volume samplers allocate: __float_volume, " << float_volumes.size() * sizeof(float_volume) << " bytes";
 	VLOG(1) << "Volume samplers allocate: __float3_volume, " << float3_volumes.size() * sizeof(float3_volume) << " bytes";
 
+#ifdef WITH_OPENVDB
 	for(size_t i = 0; i < scalar_grids.size(); ++i) {
 		VLOG(1) << scalar_grids[i]->getName() << " memory usage: " << scalar_grids[i]->memUsage() / 1024.0f << " kilobytes.\n";
 	}
@@ -245,6 +250,7 @@ void VolumeManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
 	for(size_t i = 0; i < vector_grids.size(); ++i) {
 		VLOG(1) << vector_grids[i]->getName() << " memory usage: " << vector_grids[i]->memUsage() / 1024.0f << " kilobytes.\n";
 	}
+#endif
 
 	need_update = false;
 }
diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 4fc8075..66f055d 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3495,4 +3495,10 @@ void smokeModifier_OpenVDB_update_transform(SmokeModifierData *smd, Scene *scene
 	UNUSED_VARS(smd, scene, ob, update, update_cb_data);
 }
 
+void BKE_openvdb_cache_filename(char *r_filename, const char *path, const char *fname, const char *relbase, int frame)
+{
+	r_filename[0] = '\0';
+	UNUSED_VARS(path, fname, relbase, frame);
+}
+
 #endif




More information about the Bf-blender-cvs mailing list