[Bf-blender-cvs] [02a0789] openvdb: Try to sample VDB volumes through the attribute node.

[Kévin Dietrich]

Commit: 02a07894a4b6dd7602a162c282f1995bda50087f
Author: Kévin Dietrich
Date:   Thu Jul 7 14:18:15 2016 +0200
Branches: openvdb
https://developer.blender.org/rB02a07894a4b6dd7602a162c282f1995bda50087f

Try to sample VDB volumes through the attribute node.

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

M	intern/cycles/kernel/geom/geom_volume.h

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

diff --git a/intern/cycles/kernel/geom/geom_volume.h b/intern/cycles/kernel/geom/geom_volume.h
index 2044aaf..165fc12 100644
--- a/intern/cycles/kernel/geom/geom_volume.h
+++ b/intern/cycles/kernel/geom/geom_volume.h
@@ -74,10 +74,12 @@ ccl_device float volume_attribute_float(KernelGlobals *kg, const ShaderData *sd,
 #  endif
 #else
 	float4 r;
-	if(sd->flag & SD_VOLUME_CUBIC)
-		r = kernel_tex_image_interp_3d_ex(id, P.x, P.y, P.z, INTERPOLATION_CUBIC);
-	else
-		r = kernel_tex_image_interp_3d(id, P.x, P.y, P.z);
+//	if(sd->flag & SD_VOLUME_CUBIC)
+//		r = kernel_tex_image_interp_3d_ex(id, P.x, P.y, P.z, INTERPOLATION_CUBIC);
+//	else
+//		r = kernel_tex_image_interp_3d(id, P.x, P.y, P.z);
+
+	return kernel_tex_voxel_float(id, P.x, P.y, P.z, OPENVDB_SAMPLE_POINT);
 #endif
 
 	if(dx) *dx = 0.0f;