Commit: dde162d76078d63a50544c8f415c889eea0270ed
Author: Kévin Dietrich
Date: Thu Jul 2 12:01:39 2015 +0200
Branches: openvdb
https://developer.blender.org/rBdde162d76078d63a50544c8f415c889eea0270ed
Cycles: take radius of the sampling kernel into account for ray
intersection.
As the samplers are hidden in a single class, the radius is set to the
largest.
===================================================================
M intern/cycles/util/util_volume.h
===================================================================
diff --git a/intern/cycles/util/util_volume.h b/intern/cycles/util/util_volume.h
index b0fcaac..f13699f 100644
--- a/intern/cycles/util/util_volume.h
+++ b/intern/cycles/util/util_volume.h
@@ -96,7 +96,8 @@ public:
/* only grids with uniform voxels can be used with
VolumeRayIntersector */
if(grid->hasUniformVoxels()) {
uniform_voxels = true;
- main_isector = new isector_t(*grid);
+ /* 1 = size of the largest sampling kernel radius
(BoxSampler) */
+ main_isector = new isector_t(*grid, 1);
}
else {
uniform_voxels = false;
@@ -273,7 +274,8 @@ public:
/* only grids with uniform voxels can be used with
VolumeRayIntersector */
if(grid->hasUniformVoxels()) {
uniform_voxels = true;
- main_isector = new isector_t(*grid);
+ /* 1 = size of the largest sampling kernel radius
(BoxSampler) */
+ main_isector = new isector_t(*grid, 1);
}
else {
uniform_voxels = false;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
