diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-09-01 04:49:28 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2014-09-01 04:49:28 +0400 |
| commit | 35bc266de7c8e4b3e8904adfec0128af4bf9051e (patch) | |
| tree | 63163f3eb626fe9824ab2e6e843282558f28aa78 /intern | |
| parent | ab6f4491ea83477ea9ed0a0e93d21ca5ac2254f7 (diff) | |
Cleanup: Silence compiler warning.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/kernel_path.h | 1 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_path_volume.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/kernel_path.h b/intern/cycles/kernel/kernel_path.h index ab4b5ecd411..65755f0df12 100644 --- a/intern/cycles/kernel/kernel_path.h +++ b/intern/cycles/kernel/kernel_path.h @@ -864,6 +864,7 @@ ccl_device float4 kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in VolumeIntegrateResult result = kernel_volume_decoupled_scatter(kg, &ps, &pray, &volume_sd, &tp, rphase, rscatter, &volume_segment, NULL, false); + (void)result; kernel_assert(result == VOLUME_PATH_SCATTERED); if(kernel_path_volume_bounce(kg, rng, &volume_sd, &tp, &ps, &L, &pray)) { diff --git a/intern/cycles/kernel/kernel_path_volume.h b/intern/cycles/kernel/kernel_path_volume.h index 9189e5c518d..9da1cfe7093 100644 --- a/intern/cycles/kernel/kernel_path_volume.h +++ b/intern/cycles/kernel/kernel_path_volume.h @@ -144,6 +144,7 @@ ccl_device void kernel_branched_path_volume_connect_light(KernelGlobals *kg, RNG VolumeIntegrateResult result = kernel_volume_decoupled_scatter(kg, state, ray, sd, &tp, rphase, rscatter, segment, (ls.t != FLT_MAX)? &ls.P: NULL, false); + (void)result; kernel_assert(result == VOLUME_PATH_SCATTERED); /* todo: split up light_sample so we don't have to call it again with new position */ @@ -194,6 +195,7 @@ ccl_device void kernel_branched_path_volume_connect_light(KernelGlobals *kg, RNG VolumeIntegrateResult result = kernel_volume_decoupled_scatter(kg, state, ray, sd, &tp, rphase, rscatter, segment, (ls.t != FLT_MAX)? &ls.P: NULL, false); + (void)result; kernel_assert(result == VOLUME_PATH_SCATTERED); /* todo: split up light_sample so we don't have to call it again with new position */ @@ -232,6 +234,7 @@ ccl_device void kernel_branched_path_volume_connect_light(KernelGlobals *kg, RNG VolumeIntegrateResult result = kernel_volume_decoupled_scatter(kg, state, ray, sd, &tp, rphase, rscatter, segment, (ls.t != FLT_MAX)? &ls.P: NULL, false); + (void)result; kernel_assert(result == VOLUME_PATH_SCATTERED); /* todo: split up light_sample so we don't have to call it again with new position */ |