[Bf-blender-cvs] [fc05d96] openvdb: Cycles: rename openvdb.* files to volume.*

[Kévin Dietrich]

Commit: fc05d9603f0050b735d19c461cb5bcfb8ae7dd97
Author: Kévin Dietrich
Date:   Sat Jun 13 02:38:24 2015 +0200
Branches: openvdb
https://developer.blender.org/rBfc05d9603f0050b735d19c461cb5bcfb8ae7dd97

Cycles: rename openvdb.* files to volume.*

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

M	intern/cycles/kernel/kernel_compat_cpu.h
M	intern/cycles/render/CMakeLists.txt
M	intern/cycles/render/nodes.cpp
D	intern/cycles/render/openvdb.cpp
D	intern/cycles/render/openvdb.h
M	intern/cycles/render/scene.cpp
M	intern/cycles/render/scene.h
A	intern/cycles/render/volume.cpp
A	intern/cycles/render/volume.h
M	intern/cycles/util/CMakeLists.txt
D	intern/cycles/util/util_openvdb.h
A	intern/cycles/util/util_volume.h

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

diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index acbfd67..8a38c2a 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -39,8 +39,8 @@
 #include "util_simd.h"
 #include "util_half.h"
 #include "util_types.h"
-#include "util_openvdb.h"
 #include "util_vector.h"
+#include "util_volume.h"
 
 #define ccl_addr_space
 
diff --git a/intern/cycles/render/CMakeLists.txt b/intern/cycles/render/CMakeLists.txt
index e85b7e6..1fcdd6f 100644
--- a/intern/cycles/render/CMakeLists.txt
+++ b/intern/cycles/render/CMakeLists.txt
@@ -35,7 +35,6 @@ set(SRC
 	mesh_displace.cpp
 	nodes.cpp
 	object.cpp
-	openvdb.cpp
 	osl.cpp
 	particles.cpp
 	curves.cpp
@@ -47,6 +46,7 @@ set(SRC
 	svm.cpp
 	tables.cpp
 	tile.cpp
+	volume.cpp
 )
 
 set(SRC_HEADERS
@@ -63,7 +63,6 @@ set(SRC_HEADERS
 	mesh.h
 	nodes.h
 	object.h
-	openvdb.h
 	osl.h
 	particles.h
 	curves.h
@@ -76,6 +75,7 @@ set(SRC_HEADERS
 	svm.h
 	tables.h
 	tile.h
+	volume.h
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${RTTI_DISABLE_FLAGS}")
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 2b02d63..0cf953c 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -16,11 +16,11 @@
 
 #include "image.h"
 #include "nodes.h"
-#include "openvdb.h"
 #include "svm.h"
 #include "svm_math_util.h"
 #include "osl.h"
 #include "sky_model.h"
+#include "volume.h"
 
 #include "util_foreach.h"
 #include "util_transform.h"
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index 1363302..8878db2 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -26,13 +26,13 @@
 #include "light.h"
 #include "mesh.h"
 #include "object.h"
-#include "openvdb.h"
 #include "osl.h"
 #include "particles.h"
 #include "scene.h"
 #include "shader.h"
 #include "svm.h"
 #include "tables.h"
+#include "volume.h"
 
 #include "util_foreach.h"
 #include "util_progress.h"
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index e53e75f..e588394 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -24,7 +24,7 @@
 
 #include "kernel_types.h"
 
-#include "util_openvdb.h"
+#include "util_volume.h"
 #include "util_param.h"
 #include "util_string.h"
 #include "util_system.h"
diff --git a/intern/cycles/render/openvdb.cpp b/intern/cycles/render/volume.cpp
similarity index 99%
rename from intern/cycles/render/openvdb.cpp
rename to intern/cycles/render/volume.cpp
index 8ca613c..ea15d40 100644
--- a/intern/cycles/render/openvdb.cpp
+++ b/intern/cycles/render/volume.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "openvdb.h"
+#include "volume.h"
 #include "scene.h"
 #include "util_logging.h"
 #include "util_progress.h"
diff --git a/intern/cycles/render/openvdb.h b/intern/cycles/render/volume.h
similarity index 98%
rename from intern/cycles/render/openvdb.h
rename to intern/cycles/render/volume.h
index 2aa2162..665e0bc 100644
--- a/intern/cycles/render/openvdb.h
+++ b/intern/cycles/render/volume.h
@@ -17,9 +17,9 @@
 #ifndef __VOLUMEMANAGER_H__
 #define __VOLUMEMANAGER_H__
 
-#include "util_openvdb.h"
 #include "util_string.h"
 #include "util_types.h"
+#include "util_volume.h"
 
 CCL_NAMESPACE_BEGIN
 
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index a9217c6..4bfc184 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -52,7 +52,6 @@ set(SRC_HEADERS
 	util_math_fast.h
 	util_md5.h
 	util_opengl.h
-	util_openvdb.h
 	util_optimization.h
 	util_param.h
 	util_path.h
@@ -72,6 +71,7 @@ set(SRC_HEADERS
 	util_types.h
 	util_vector.h
 	util_view.h
+	util_volume.h
 	util_xml.h
 )
 
diff --git a/intern/cycles/util/util_openvdb.h b/intern/cycles/util/util_volume.h
similarity index 99%
rename from intern/cycles/util/util_openvdb.h
rename to intern/cycles/util/util_volume.h
index cb38211..148ac02 100644
--- a/intern/cycles/util/util_openvdb.h
+++ b/intern/cycles/util/util_volume.h
@@ -1,5 +1,5 @@
-#ifndef __UTIL_OPENVDB_H__
-#define __UTIL_OPENVDB_H__
+#ifndef __UTIL_VOLUME_H__
+#define __UTIL_VOLUME_H__
 
 #include "util_map.h"
 #include "util_types.h"
@@ -408,5 +408,5 @@ CCL_NAMESPACE_END
 
 #endif /* WITH_OPENVDB */
 
-#endif /* __UTIL_OPENVDB_H__ */
+#endif /* __UTIL_VOLUME_H__ */