kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix compile issue on windows, broke this trying to fix for mac.

Browse Source
This commit is contained in:
Brecht Van Lommel 2011-12-04 15:49:14 +00:00
parent 753bfe730a
commit 6c6b0ecb27
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/util/util_boundbox.h
View File

@ -19,12 +19,15 @@
#ifndef __UTIL_BOUNDBOX_H__ #ifndef __UTIL_BOUNDBOX_H__
#define __UTIL_BOUNDBOX_H__ #define __UTIL_BOUNDBOX_H__
#include <math.h>
#include <float.h> #include <float.h>
#include <cmath>
#include "util_math.h"
#include "util_transform.h" #include "util_transform.h"
#include "util_types.h" #include "util_types.h"
using namespace std;
CCL_NAMESPACE_BEGIN CCL_NAMESPACE_BEGIN
class BoundBox class BoundBox
@ -73,8 +76,8 @@ public:
bool valid(void) const bool valid(void) const
{ {
return (min.x <= max.x) && (min.y <= max.y) && (min.z <= max.z) && 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)) && !(isnan(min.x) || isnan(min.y) || isnan(min.z)) &&
!(std::isnan(max.x) || std::isnan(max.y) || std::isnan(max.z)); !(isnan(max.x) || isnan(max.y) || isnan(max.z));
} }
BoundBox transformed(const Transform *tfm) BoundBox transformed(const Transform *tfm)

1
intern/cycles/util/util_math.h
View File

@ -63,6 +63,7 @@ CCL_NAMESPACE_BEGIN
#if(!defined(FREE_WINDOWS)) #if(!defined(FREE_WINDOWS))
#define copysignf(x, y) ((float)_copysign(x, y)) #define copysignf(x, y) ((float)_copysign(x, y))
#define hypotf(x, y) _hypotf(x, y) #define hypotf(x, y) _hypotf(x, y)
#define isnan(x) _isnan(x)
#endif #endif
#endif #endif