diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-09-28 00:35:37 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-09-28 00:35:37 +0400 |
| commit | 21825c4359159798da2b0b25da8ef1131c7399d1 (patch) | |
| tree | 87e746267e3a4ef5dc13a79abce5261a192caf88 | |
| parent | 53b05e4f06425aa3c20082da454d8114e58d53ed (diff) | |
Cycles: Avoid temp variable in camera-in-volume check
Was a left-over from some experiments, no need it with the current
implementation, and likely wouldn't need in the future.
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_volume.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index 5cd4504b7b3..29077a8886c 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -371,7 +371,7 @@ ccl_device void kernel_path_subsurface_update_volume_stack(KernelGlobals *kg, Intersection isect; const float3 Pend = volume_ray.P + volume_ray.D*volume_ray.t; - while(scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY + while(scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY, &isect, NULL, 0.0f, 0.0f)) { ShaderData sd; diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h index 1273869ca28..794ce925777 100644 --- a/intern/cycles/kernel/kernel_volume.h +++ b/intern/cycles/kernel/kernel_volume.h @@ -985,10 +985,9 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg, enclosed_index < VOLUME_STACK_SIZE - 1) { Intersection isect; - bool hit = scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY, - &isect, - NULL, 0.0f, 0.0f); - if(!hit) { + if(!scene_intersect(kg, &volume_ray, PATH_RAY_ALL_VISIBILITY, + &isect, NULL, 0.0f, 0.0f)) + { break; } |