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:
authorJoerg Mueller <nexyon@gmail.com>2011-07-14 09:56:47 +0400
committerJoerg Mueller <nexyon@gmail.com>2011-07-14 09:56:47 +0400
commitd838d82151efaa801276db0f0c972b5bbc8f1876 (patch)
tree7b54824c936dd5c8800cd4acc0bebbd08616cad5 /intern/audaspace
parent49d01fb30de6ed5c6d68cb204de52f5db2f7e649 (diff)
3D Audio GSoC:
MSVC compile fixes.
Diffstat (limited to 'intern/audaspace')
-rw-r--r--intern/audaspace/intern/AUD_ChannelMapperReader.cpp2
-rw-r--r--intern/audaspace/intern/AUD_SoftwareDevice.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/audaspace/intern/AUD_ChannelMapperReader.cpp b/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
index dd6f5b43953..27d10ce6dc8 100644
--- a/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
+++ b/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
@@ -60,7 +60,7 @@ void AUD_ChannelMapperReader::setChannels(AUD_Channels channels)
void AUD_ChannelMapperReader::setMonoAngle(float angle)
{
- if(std::isnan(angle))
+ if(angle != angle)
angle = 0;
m_mono_angle = angle;
if(m_source_channels == AUD_CHANNELS_MONO)
diff --git a/intern/audaspace/intern/AUD_SoftwareDevice.cpp b/intern/audaspace/intern/AUD_SoftwareDevice.cpp
index 5e430860704..125b9d705dd 100644
--- a/intern/audaspace/intern/AUD_SoftwareDevice.cpp
+++ b/intern/audaspace/intern/AUD_SoftwareDevice.cpp
@@ -43,6 +43,10 @@
#include <cmath>
#include <limits>
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
typedef enum
{
AUD_RENDER_DISTANCE = 0x01,