Commit: 537bd0eb51d4dcc2961a99f2009412d69779ca22
Author: Sergey Sharybin
Date: Tue Nov 3 18:44:33 2015 +0500
Branches: master
https://developer.blender.org/rB537bd0eb51d4dcc2961a99f2009412d69779ca22
Fix T46671: Cycles assert with CMJ sample function
With current formulation of cmj_fast_div_pow2() it should always return 0
in the case of first argument is zero and no assert really needed anymore.
===================================================================
M intern/cycles/kernel/kernel_jitter.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_jitter.h
b/intern/cycles/kernel/kernel_jitter.h
index 9ba4163..107f21f 100644
--- a/intern/cycles/kernel/kernel_jitter.h
+++ b/intern/cycles/kernel/kernel_jitter.h
@@ -34,10 +34,9 @@ ccl_device_inline int cmj_fast_mod_pow2(int a, int b)
return (a & (b - 1));
}
-/* a must be > 0 and b must be > 1 */
+/* b must be > 1 */
ccl_device_inline int cmj_fast_div_pow2(int a, int b)
{
- kernel_assert(a > 0);
kernel_assert(b > 1);
#if defined(__KERNEL_SSE2__)
# ifdef _MSC_VER
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
