[Bf-blender-cvs] [17fe79b] openvdb: Cleanup/fix: put 'using namespace' inside ifdef block.

Kévin Dietrich noreply at git.blender.org
Fri Jun 5 14:08:03 CEST 2015


Commit: 17fe79b2287b3cf5b3239aea8553fca2acd1ec45
Author: Kévin Dietrich
Date:   Tue May 26 03:47:43 2015 +0200
Branches: openvdb
https://developer.blender.org/rB17fe79b2287b3cf5b3239aea8553fca2acd1ec45

Cleanup/fix: put 'using namespace' inside ifdef block.

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

M	intern/cycles/render/openvdb.cpp

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

diff --git a/intern/cycles/render/openvdb.cpp b/intern/cycles/render/openvdb.cpp
index 618c585..53c128d 100644
--- a/intern/cycles/render/openvdb.cpp
+++ b/intern/cycles/render/openvdb.cpp
@@ -143,13 +143,14 @@ size_t find_empty_slot(Container container)
 	return slot;
 }
 
-size_t VolumeManager::add_openvdb_volume(const std::string &filename, const std::string &name, int /*sampling*/, int grid_type)
+size_t VolumeManager::add_openvdb_volume(const std::string& filename, const std::string& name, int /*sampling*/, int grid_type)
 {
-	using namespace openvdb;
 	size_t slot = -1;
 
 #ifdef WITH_OPENVDB
-	openvdb::io::File file(filename);
+	using namespace openvdb;
+
+	io::File file(filename);
 	file.open();
 
 	if(grid_type == NODE_VDB_FLOAT) {




More information about the Bf-blender-cvs mailing list