Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-05-17 18:23:32 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-05-17 18:23:32 +0300
commit9a910443c471a9059423fbd24b41c11e7fd9e98e (patch)
tree33dcf5107745d7ede906dd860848ea1f16027395 /intern/cycles/render/image.cpp
parent1d49205b1a1d39bdc47ac85ce8ec70a773a1a7e0 (diff)
Fix compilation error in Cycles
Was caused by recent fix with finite checks. Fixes T51536.
Diffstat (limited to 'intern/cycles/render/image.cpp')
-rw-r--r--intern/cycles/render/image.cpp10
1 files changed, 10 insertions, 0 deletions
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;