Merge remote-tracking branch 'origin/master' into blender2.8

1 files changed, 10 insertions, 1 deletions

diff --git a/intern/cycles/util/util_simd.h b/intern/cycles/util/util_simd.h
index f432fd7957a..04341451afb 100644
--- a/intern/cycles/util/util_simd.h
+++ b/intern/cycles/util/util_simd.h
@@ -454,12 +454,21 @@ ccl_device_inline int bitscan(int value)
 {
 	assert(value != 0);
 	int bit = 0;
-	while(value >>= 1) {
+	while((value & (1 << bit)) == 0) {
 		++bit;
 	}
 	return bit;
 }
 
+ccl_device_inline int __bsr(int value)
+{
+	assert(value != 0);
+	int bit = 0;
+	while(value >>= 1) {
+		++bit;
+	}
+	return bit;
+}
 
 #endif /* __KERNEL_SSE2__ */