[Bf-blender-cvs] [9a910443c47] master: Fix compilation error in Cycles

Sergey Sharybin noreply at git.blender.org
Wed May 17 17:24:41 CEST 2017


Commit: 9a910443c471a9059423fbd24b41c11e7fd9e98e
Author: Sergey Sharybin
Date:   Wed May 17 17:23:32 2017 +0200
Branches: master
https://developer.blender.org/rB9a910443c471a9059423fbd24b41c11e7fd9e98e

Fix compilation error in Cycles

Was caused by recent fix with finite checks.

Fixes T51536.

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

M	intern/cycles/render/image.cpp

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

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index e242192e9e0..da020f4a48d 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -30,6 +30,16 @@
 
 CCL_NAMESPACE_BEGIN
 
+/* Some helpers to silence warning in templated function. */
+static bool isfinite(uchar /*value*/)
+{
+	return false;
+}
+static bool isfinite(half /*value*/)
+{
+	return false;
+}
+
 ImageManager::ImageManager(const DeviceInfo& info)
 {
 	need_update = true;




More information about the Bf-blender-cvs mailing list