[Bf-blender-cvs] [52302757cd9] master: Fix T54455: OpenCL build error after recent changes.
Brecht Van Lommel
noreply at git.blender.org
Thu Mar 29 07:16:07 CEST 2018
Commit: 52302757cd9eec2213ed6d3df66728755b30120d
Author: Brecht Van Lommel
Date: Thu Mar 29 07:11:22 2018 +0200
Branches: master
https://developer.blender.org/rB52302757cd9eec2213ed6d3df66728755b30120d
Fix T54455: OpenCL build error after recent changes.
===================================================================
M intern/cycles/kernel/kernel_path_state.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_path_state.h b/intern/cycles/kernel/kernel_path_state.h
index 479bb22d780..8a358e51f94 100644
--- a/intern/cycles/kernel/kernel_path_state.h
+++ b/intern/cycles/kernel/kernel_path_state.h
@@ -164,6 +164,7 @@ ccl_device_inline void path_state_next(KernelGlobals *kg, ccl_addr_space PathSta
#endif
}
+#ifdef __VOLUME__
ccl_device_inline bool path_state_volume_next(KernelGlobals *kg, ccl_addr_space PathState *state)
{
/* For volume bounding meshes we pass through without counting transparent
@@ -180,6 +181,7 @@ ccl_device_inline bool path_state_volume_next(KernelGlobals *kg, ccl_addr_space
return true;
}
+#endif
ccl_device_inline uint path_state_ray_visibility(KernelGlobals *kg, ccl_addr_space PathState *state)
{
More information about the Bf-blender-cvs
mailing list