From 537bd0eb51d4dcc2961a99f2009412d69779ca22 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 3 Nov 2015 18:44:33 +0500 Subject: 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. --- intern/cycles/kernel/kernel_jitter.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/intern/cycles/kernel/kernel_jitter.h b/intern/cycles/kernel/kernel_jitter.h index 9ba41635b9e..107f21fc081 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 -- cgit v1.2.3