[Bf-blender-cvs] [4832538] master: Cycles: Keep STACK_MAX_HITS private in kernel_shadow

Sergey Sharybin noreply at git.blender.org
Fri Sep 26 10:23:59 CEST 2014


Commit: 4832538ad08198f88444997c55ca5ff2f9da4458
Author: Sergey Sharybin
Date:   Fri Sep 26 14:22:11 2014 +0600
Branches: master
https://developer.blender.org/rB4832538ad08198f88444997c55ca5ff2f9da4458

Cycles: Keep STACK_MAX_HITS private in kernel_shadow

This way adding record_all for other things becomes easier and doesn't
lead to naming conflicts.

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

M	intern/cycles/kernel/kernel_shadow.h

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

diff --git a/intern/cycles/kernel/kernel_shadow.h b/intern/cycles/kernel/kernel_shadow.h
index 28abc86..6195428 100644
--- a/intern/cycles/kernel/kernel_shadow.h
+++ b/intern/cycles/kernel/kernel_shadow.h
@@ -181,6 +181,8 @@ ccl_device_inline bool shadow_blocked(KernelGlobals *kg, PathState *state, Ray *
 	return blocked;
 }
 
+#undef STACK_MAX_HITS
+
 #else
 
 /* Shadow function to compute how much light is blocked, GPU variation.




More information about the Bf-blender-cvs mailing list