[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52217] trunk/blender/intern/cycles/kernel /osl/osl_globals.h: Fix OSL build error on linux.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Nov 14 23:45:44 CET 2012


Revision: 52217
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52217
Author:   blendix
Date:     2012-11-14 22:45:44 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
Fix OSL build error on linux.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_globals.h

Modified: trunk/blender/intern/cycles/kernel/osl/osl_globals.h
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_globals.h	2012-11-14 22:15:45 UTC (rev 52216)
+++ trunk/blender/intern/cycles/kernel/osl/osl_globals.h	2012-11-14 22:45:44 UTC (rev 52217)
@@ -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;




More information about the Bf-blender-cvs mailing list