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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-15 02:45:44 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-11-15 02:45:44 +0400
commit16f1c86953c32ad1c0691a87adcc432b9300abb1 (patch)
tree2394037159f3d7d5869c70d056d9070af5a4f29c /intern/cycles/kernel/osl/osl_globals.h
parent42db4fb50a847197ab83c00dd799d9645d761b01 (diff)
Fix OSL build error on linux.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_globals.h')
-rw-r--r--intern/cycles/kernel/osl/osl_globals.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h
index 80ced9dfd62..003e39ca3c3 100644
--- a/intern/cycles/kernel/osl/osl_globals.h
+++ b/intern/cycles/kernel/osl/osl_globals.h
@@ -22,12 +22,17 @@
#ifdef WITH_OSL
#include <OSL/oslexec.h>
+#include <cmath>
#include "util_map.h"
#include "util_param.h"
#include "util_thread.h"
#include "util_vector.h"
+#ifndef WIN32
+using std::isfinite;
+#endif
+
CCL_NAMESPACE_BEGIN
class OSLRenderServices;