[Bf-blender-cvs] [3e4d053] openvdb: Cycles: style cleanup.

[Kévin Dietrich]

Commit: 3e4d053a167a3241c87d9c73cebd41617c1a9d08
Author: Kévin Dietrich
Date:   Sat May 23 02:39:57 2015 +0200
Branches: openvdb
https://developer.blender.org/rB3e4d053a167a3241c87d9c73cebd41617c1a9d08

Cycles: style cleanup.

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

M	intern/cycles/render/nodes.cpp
M	intern/cycles/render/nodes.h
M	intern/cycles/render/openvdb.cpp
M	intern/cycles/render/openvdb.h

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

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 0740e457..6c90f16 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -4372,7 +4372,6 @@ OpenVDBNode::OpenVDBNode()
 	filename = "";
 	volume_manager = NULL;
 	sampling = OPENVDB_SAMPLE_POINT;
-
 	tfm = transform_identity();
 
 	add_input("Vector", SHADER_SOCKET_POINT, ShaderInput::POSITION);
@@ -4386,7 +4385,7 @@ void OpenVDBNode::attributes(Shader *shader, AttributeRequestSet *attributes)
 	ShaderNode::attributes(shader, attributes);
 }
 
-void OpenVDBNode::compile(SVMCompiler &compiler)
+void OpenVDBNode::compile(SVMCompiler& compiler)
 {
 	ShaderInput *vector_in = input("Vector");
 	volume_manager = compiler.volume_manager;
@@ -4430,9 +4429,8 @@ void OpenVDBNode::compile(SVMCompiler &compiler)
 	}
 }
 
-void OpenVDBNode::compile(OSLCompiler &compiler)
+void OpenVDBNode::compile(OSLCompiler& /*compiler*/)
 {
-	(void)compiler;
 }
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/render/nodes.h b/intern/cycles/render/nodes.h
index 74d0c2b..c612004 100644
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@ -679,7 +679,6 @@ public:
 	vector<ustring> output_names;
 
 	Transform tfm;
-	TextureMapping tex_mapping;
 };
 
 CCL_NAMESPACE_END
diff --git a/intern/cycles/render/openvdb.cpp b/intern/cycles/render/openvdb.cpp
index 0d61209..53dcfe5 100644
--- a/intern/cycles/render/openvdb.cpp
+++ b/intern/cycles/render/openvdb.cpp
@@ -52,12 +52,12 @@ static inline void catch_exceptions()
 	try {
 		throw;
 	}
-	catch (const openvdb::IoError &e) {
+	catch (const openvdb::IoError& e) {
 		std::cerr << e.what() << "\n";
 	}
 }
 
-int VolumeManager::add_volume(const string &filename, const string &name, int sampling, int grid_type)
+int VolumeManager::add_volume(const string& filename, const string& name, int sampling, int grid_type)
 {
 	using namespace openvdb;
 	size_t slot = -1;
@@ -92,7 +92,7 @@ int VolumeManager::add_volume(const string &filename, const string &name, int sa
 	return slot;
 }
 
-int VolumeManager::find_existing_slot(const string &filename, const string &name, int sampling, int grid_type)
+int VolumeManager::find_existing_slot(const string& filename, const string& name, int sampling, int grid_type)
 {
 	for(size_t i = 0; i < current_grids.size(); ++i) {
 		GridDescription grid = current_grids[i];
@@ -175,7 +175,7 @@ size_t VolumeManager::add_vector_grid(openvdb::Vec3SGrid::Ptr grid)
 	return slot;
 }
 
-void VolumeManager::add_grid_description(const string &filename, const string &name, int sampling, int slot)
+void VolumeManager::add_grid_description(const string& filename, const string& name, int sampling, int slot)
 {
 	GridDescription descr;
 	descr.filename = filename;
@@ -186,7 +186,7 @@ void VolumeManager::add_grid_description(const string &filename, const string &n
 	current_grids.push_back(descr);
 }
 
-void VolumeManager::device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress &progress)
+void VolumeManager::device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
 {
 	(void)scene;
 
@@ -229,10 +229,8 @@ void VolumeManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
 	need_update = false;
 }
 
-void VolumeManager::device_free(Device *device, DeviceScene *dscene)
+void VolumeManager::device_free(Device */*device*/, DeviceScene */*dscene*/)
 {
-	(void)device;
-	(void)dscene;
 }
 
 #else
@@ -246,12 +244,12 @@ VolumeManager::~VolumeManager()
 {
 }
 
-int VolumeManager::add_volume(const string &/*filename*/, const string &/*name*/, int /*sampling*/, int /*grid_type*/)
+int VolumeManager::add_volume(const string& /*filename*/, const string& /*name*/, int /*sampling*/, int /*grid_type*/)
 {
 	return -1;
 }
 
-void VolumeManager::device_update(Device */*device*/, DeviceScene */*dscene*/, Scene */*scene*/, Progress &/*progress*/)
+void VolumeManager::device_update(Device */*device*/, DeviceScene */*dscene*/, Scene */*scene*/, Progress& /*progress*/)
 {
 }
 
diff --git a/intern/cycles/render/openvdb.h b/intern/cycles/render/openvdb.h
index ab02def..db14bce 100644
--- a/intern/cycles/render/openvdb.h
+++ b/intern/cycles/render/openvdb.h
@@ -48,14 +48,14 @@ class VolumeManager {
 
 	void delete_volume(int grid_type, int sampling, size_t slot);
 
-	void add_grid_description(const string &filename, const string &name, int sampling, int slot);
-	int find_existing_slot(const string &filename, const string &name, int sampling, int grid_type);
+	void add_grid_description(const string& filename, const string& name, int sampling, int slot);
+	int find_existing_slot(const string& filename, const string& name, int sampling, int grid_type);
 
 public:
 	VolumeManager();
 	~VolumeManager();
 
-	int add_volume(const string &filename, const string &name, int sampling, int grid_type);
+	int add_volume(const string& filename, const string& name, int sampling, int grid_type);
 
 	void device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress);
 	void device_free(Device *device, DeviceScene *dscene);