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>2011-12-04 01:27:19 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-12-04 01:27:19 +0400
commit341aa730bd042ccf1b1511cf32db485c7cfcdfc8 (patch)
tree7c48da9dbb7f11106af5de00b0936e5ec90855b1 /intern/cycles/util/util_boundbox.h
parent03b807e7dcbd186ce75a726c6935e96e855b8290 (diff)
Fix cycles compile issue after last commit.
Diffstat (limited to 'intern/cycles/util/util_boundbox.h')
-rw-r--r--intern/cycles/util/util_boundbox.h6
1 files changed, 3 insertions, 3 deletions
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)