[Bf-blender-cvs] [885c0a5f909] master: Cycles: Fix compilation warning
Sergey Sharybin
noreply at git.blender.org
Mon Sep 4 13:28:28 CEST 2017
Commit: 885c0a5f909115377bc94bc86e7a9ceac9849346
Author: Sergey Sharybin
Date: Mon Sep 4 13:28:15 2017 +0200
Branches: master
https://developer.blender.org/rB885c0a5f909115377bc94bc86e7a9ceac9849346
Cycles: Fix compilation warning
===================================================================
M intern/cycles/util/util_math.h
===================================================================
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index 348e652eadd..fb04d49bcd9 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -224,7 +224,7 @@ ccl_device_inline bool isfinite_safe(float f)
{
/* By IEEE 754 rule, 2*Inf equals Inf */
unsigned int x = __float_as_uint(f);
- return (f == f) && (x == 0 || x == (1 << 31) || (f != 2.0f*f)) && !((x << 1) > 0xff000000u);
+ return (f == f) && (x == 0 || x == (1u << 31) || (f != 2.0f*f)) && !((x << 1) > 0xff000000u);
}
ccl_device_inline float ensure_finite(float v)
More information about the Bf-blender-cvs
mailing list