diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-04 01:27:19 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-04 01:27:19 +0400 |
commit | 341aa730bd042ccf1b1511cf32db485c7cfcdfc8 (patch) | |
tree | 7c48da9dbb7f11106af5de00b0936e5ec90855b1 /intern | |
parent | 03b807e7dcbd186ce75a726c6935e96e855b8290 (diff) |
Fix cycles compile issue after last commit.
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_boundbox.h | 6 | ||||
-rw-r--r-- | intern/cycles/util/util_math.h | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 8abc060af47..7cd190f877d 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -454,7 +454,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug xml_read_ustring(&attr->attribute, node, "attribute"); snode = attr; } - else if(string_ieuals(node.name(), "camera")) { + else if(string_iequals(node.name(), "camera")) { snode = new CameraNode(); } else if(string_iequals(node.name(), "fresnel")) { diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h index b4c5e4e71ca..24ea3655576 100644 --- a/intern/cycles/util/util_boundbox.h +++ b/intern/cycles/util/util_boundbox.h @@ -20,8 +20,8 @@ #define __UTIL_BOUNDBOX_H__ #include <float.h> +#include <cmath> -#include "util_math.h" #include "util_transform.h" #include "util_types.h" @@ -73,8 +73,8 @@ public: bool valid(void) const { return (min.x <= max.x) && (min.y <= max.y) && (min.z <= max.z) && - !(isnan(min.x) || isnan(min.y) || isnan(min.z)) && - !(isnan(max.x) || isnan(max.y) || isnan(max.z)); + !(std::isnan(min.x) || std::isnan(min.y) || std::isnan(min.z)) && + !(std::isnan(max.x) || std::isnan(max.y) || std::isnan(max.z)); } BoundBox transformed(const Transform *tfm) diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index 7c56f0fbb12..2f9e00dbfcb 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -63,7 +63,6 @@ CCL_NAMESPACE_BEGIN #if(!defined(FREE_WINDOWS)) #define copysignf(x, y) ((float)_copysign(x, y)) #define hypotf(x, y) _hypotf(x, y) -#define isnan(x) _isnan(x) #endif #endif |