Commit: 35bc266de7c8e4b3e8904adfec0128af4bf9051e
Author: Thomas Dinges
Date: Mon Sep 1 02:49:28 2014 +0200
Branches: master
https://developer.blender.org/rB35bc266de7c8e4b3e8904adfec0128af4bf9051e
Cleanup: Silence compiler warning.
===================================================================
M intern/cycles/kernel/kernel_path.h
M intern/cycles/kernel/kernel_path_volume.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_path.h
b/intern/cycles/kernel/kernel_path.h
index ab4b5ec..65755f0 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 9189e5c..9da1cfe 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 */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
