From 6c6b0ecb27101770bf09758701022c874b0170f5 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 4 Dec 2011 15:49:14 +0000 Subject: Fix compile issue on windows, broke this trying to fix for mac. --- intern/cycles/util/util_boundbox.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'intern/cycles/util/util_boundbox.h') diff --git a/intern/cycles/util/util_boundbox.h b/intern/cycles/util/util_boundbox.h index 24ea3655576..0114a9a26a5 100644 --- a/intern/cycles/util/util_boundbox.h +++ b/intern/cycles/util/util_boundbox.h @@ -19,12 +19,15 @@ #ifndef __UTIL_BOUNDBOX_H__ #define __UTIL_BOUNDBOX_H__ +#include #include -#include +#include "util_math.h" #include "util_transform.h" #include "util_types.h" +using namespace std; + CCL_NAMESPACE_BEGIN class BoundBox @@ -73,8 +76,8 @@ public: bool valid(void) const { return (min.x <= max.x) && (min.y <= max.y) && (min.z <= 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)); + !(isnan(min.x) || isnan(min.y) || isnan(min.z)) && + !(isnan(max.x) || isnan(max.y) || isnan(max.z)); } BoundBox transformed(const Transform *tfm) -- cgit v1.2.3