[Bf-blender-cvs] [515794df9a6] cycles-x: Cycles: Undefine utility macro after use

Sergey Sharybin noreply at git.blender.org
Tue May 4 15:13:17 CEST 2021


Commit: 515794df9a614115d514d75d27829bef91f8cfcc
Author: Sergey Sharybin
Date:   Tue May 4 15:12:35 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB515794df9a614115d514d75d27829bef91f8cfcc

Cycles: Undefine utility macro after use

Was missing since the initial implementation of those macros for the
new integrator kernels.

===================================================================

M	intern/cycles/kernel/device/cpu/kernel_arch.h

===================================================================

diff --git a/intern/cycles/kernel/device/cpu/kernel_arch.h b/intern/cycles/kernel/device/cpu/kernel_arch.h
index a82f33c890a..76dbff5517c 100644
--- a/intern/cycles/kernel/device/cpu/kernel_arch.h
+++ b/intern/cycles/kernel/device/cpu/kernel_arch.h
@@ -45,6 +45,8 @@ KERNEL_INTEGRATOR_SHADE_FUNCTION(shade_volume);
 KERNEL_INTEGRATOR_SHADE_FUNCTION(megakernel);
 
 #undef KERNEL_INTEGRATOR_FUNCTION
+#undef KERNEL_INTEGRATOR_INIT_FUNCTION
+#undef KERNEL_INTEGRATOR_SHADE_FUNCTION
 
 /* Film. */



More information about the Bf-blender-cvs mailing list