[Bf-blender-cvs] [adf0a12] openvdb: Merge branch 'openvdb' into cvdb_ray_isect

[Kévin Dietrich]

Commit: adf0a12fa1a7b40be8be5a02a606dd217496bc6d
Author: Kévin Dietrich
Date:   Sat Jan 23 09:23:55 2016 +0100
Branches: openvdb
https://developer.blender.org/rBadf0a12fa1a7b40be8be5a02a606dd217496bc6d

Merge branch 'openvdb' into cvdb_ray_isect

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



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

diff --cc intern/cycles/render/volume.cpp
index 7a6243c,8d305c2..6f92c11
--- a/intern/cycles/render/volume.cpp
+++ b/intern/cycles/render/volume.cpp
@@@ -257,11 -258,11 +258,11 @@@ void VolumeManager::device_update(Devic
  		return;
  	}
  
 -	dscene->data.tables.num_volumes = float_volumes.size() + float3_volumes.size();
 -	dscene->data.tables.density_index = find_density_slot();
 +	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) {