[Bf-blender-cvs] [6c0705009ef] master: Fix OpenCL compilation error - BPT without SSS.
Hristo Gueorguiev
noreply at git.blender.org
Thu May 31 00:11:00 CEST 2018
Commit: 6c0705009ef1f9d5ab917993c901b9dd1aed9c33
Author: Hristo Gueorguiev
Date: Thu May 31 00:08:56 2018 +0200
Branches: master
https://developer.blender.org/rB6c0705009ef1f9d5ab917993c901b9dd1aed9c33
Fix OpenCL compilation error - BPT without SSS.
===================================================================
M intern/cycles/kernel/split/kernel_split_common.h
===================================================================
diff --git a/intern/cycles/kernel/split/kernel_split_common.h b/intern/cycles/kernel/split/kernel_split_common.h
index b52e7bddc82..abe68104449 100644
--- a/intern/cycles/kernel/split/kernel_split_common.h
+++ b/intern/cycles/kernel/split/kernel_split_common.h
@@ -59,12 +59,15 @@ ccl_device_inline void kernel_split_path_end(KernelGlobals *kg, int ray_index)
ccl_global char *ray_state = kernel_split_state.ray_state;
#ifdef __BRANCHED_PATH__
+# ifdef __SUBSURFACE__
ccl_addr_space SubsurfaceIndirectRays *ss_indirect = &kernel_split_state.ss_rays[ray_index];
if(ss_indirect->num_rays) {
ASSIGN_RAY_STATE(ray_state, ray_index, RAY_UPDATE_BUFFER);
}
- else if(IS_FLAG(ray_state, ray_index, RAY_BRANCHED_INDIRECT_SHARED)) {
+ else
+# endif /* __SUBSURFACE__ */
+ if(IS_FLAG(ray_state, ray_index, RAY_BRANCHED_INDIRECT_SHARED)) {
int orig_ray = kernel_split_state.branched_state[ray_index].original_ray;
PathRadiance *L = &kernel_split_state.path_radiance[ray_index];
More information about the Bf-blender-cvs
mailing list