[Bf-blender-cvs] [8f098b0] openvdb: Cleanup.

[Kévin Dietrich]

Commit: 8f098b0a402ffd4ee7a4c9b20e3f7a692ef5b03a
Author: Kévin Dietrich
Date:   Sun Jan 17 18:45:29 2016 +0100
Branches: openvdb
https://developer.blender.org/rB8f098b0a402ffd4ee7a4c9b20e3f7a692ef5b03a

Cleanup.

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

M	intern/cycles/render/volume.cpp

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

diff --git a/intern/cycles/render/volume.cpp b/intern/cycles/render/volume.cpp
index 71aba3c..8d305c2 100644
--- a/intern/cycles/render/volume.cpp
+++ b/intern/cycles/render/volume.cpp
@@ -104,7 +104,7 @@ int VolumeManager::find_existing_slot(const string& filename, const string& name
 				return grid.slot;
 			}
 			else {
-				/* sampling was changed, remove the sampler */
+				/* sampling was changed, remove the volume */
 				if(grid_type == NODE_VDB_FLOAT) {
 					delete float_volumes[grid.slot];
 					float_volumes[grid.slot] = NULL;
@@ -161,7 +161,7 @@ size_t find_empty_slot(Container container)
 
 	if(slot == container.size()) {
 		if(slot == MAX_VOLUME) {
-			printf("VolumeManager::add_volume: volume sampler limit reached %d!\n",
+			printf("VolumeManager::add_volume: volume limit reached %d!\n",
 			       MAX_VOLUME);
 			return -1;
 		}
@@ -194,9 +194,9 @@ size_t VolumeManager::add_openvdb_volume(const std::string& filename, const std:
 
 		FloatGrid::Ptr fgrid = gridPtrCast<FloatGrid>(grid);
 
-		vdb_float_volume *sampler = new vdb_float_volume(fgrid);
-		sampler->create_threads_utils(TaskScheduler::thread_ids());
-		float_volumes.insert(float_volumes.begin() + slot, sampler);
+		vdb_float_volume *volume = new vdb_float_volume(fgrid);
+		volume->create_threads_utils(TaskScheduler::thread_ids());
+		float_volumes.insert(float_volumes.begin() + slot, volume);
 		scalar_grids.push_back(fgrid);
 	}
 	else if(grid_type == NODE_VDB_FLOAT3) {
@@ -206,9 +206,9 @@ size_t VolumeManager::add_openvdb_volume(const std::string& filename, const std:
 
 		Vec3SGrid::Ptr vgrid = gridPtrCast<Vec3SGrid>(grid);
 
-		vdb_float3_volume *sampler = new vdb_float3_volume(vgrid);
-		sampler->create_threads_utils(TaskScheduler::thread_ids());
-		float3_volumes.insert(float3_volumes.begin() + slot, sampler);
+		vdb_float3_volume *volume = new vdb_float3_volume(vgrid);
+		volume->create_threads_utils(TaskScheduler::thread_ids());
+		float3_volumes.insert(float3_volumes.begin() + slot, volume);
 		vector_grids.push_back(vgrid);
 	}
 #else
@@ -231,16 +231,14 @@ 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;
-
 	if(!need_update) {
 		return;
 	}
 
 	device_free(device, dscene);
-	progress.set_status("Updating OpenVDB volumes", "Sending samplers to device.");
+	progress.set_status("Updating OpenVDB volumes", "Sending volumes to device.");
 
 	for(size_t i = 0; i < float_volumes.size(); ++i) {
 		if(!float_volumes[i]) {
@@ -263,8 +261,8 @@ void VolumeManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
 	dscene->data.tables.num_volumes = float_volumes.size() + float3_volumes.size();
 	dscene->data.tables.density_index = find_density_slot();
 
-	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";
+	VLOG(1) << "Volume allocate: __float_volume, " << float_volumes.size() * sizeof(float_volume) << " bytes";
+	VLOG(1) << "Volume allocate: __float3_volume, " << float3_volumes.size() * sizeof(float3_volume) << " bytes";
 
 #ifdef WITH_OPENVDB
 	for(size_t i = 0; i < scalar_grids.size(); ++i) {