Commit: 36873837519ea991c955c67b109cb503292bd4b1 Author: Mai Lavelle Date: Tue Jan 24 05:48:49 2017 -0500 Branches: cycles_split_kernel https://developer.blender.org/rB36873837519ea991c955c67b109cb503292bd4b1
Cycles: Silence warning about redefined macro =================================================================== M intern/cycles/kernel/kernel_types.h =================================================================== diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index b49c602823..e3806f207f 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -32,7 +32,7 @@ # define ccl_addr_space #endif -#ifdef __SPLIT_KERNEL__ +#if defined(__SPLIT_KERNEL__) && !defined(__COMPUTE_DEVICE_GPU__) /* TODO(mai): need to investigate how this effects the kernel, as cpu kernel crashes without this right now */ #define __COMPUTE_DEVICE_GPU__ #endif _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
