diff options
| author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
|---|---|---|
| committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
| commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
| tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /intern/audaspace/intern/AUD_JOSResampleReader.cpp | |
| parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
| parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) | |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'intern/audaspace/intern/AUD_JOSResampleReader.cpp')
| -rw-r--r-- | intern/audaspace/intern/AUD_JOSResampleReader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/audaspace/intern/AUD_JOSResampleReader.cpp b/intern/audaspace/intern/AUD_JOSResampleReader.cpp index 87577da95cc..0448c75d777 100644 --- a/intern/audaspace/intern/AUD_JOSResampleReader.cpp +++ b/intern/audaspace/intern/AUD_JOSResampleReader.cpp @@ -36,6 +36,7 @@ /* MSVC does not have lrint */ #ifdef _MSC_VER +#if _MSC_VER < 1800 #ifdef _M_X64 #include <emmintrin.h> static inline int lrint(double d) @@ -56,6 +57,7 @@ static inline int lrint(double d) } #endif #endif +#endif // UNUSED // #define CC m_channels + channel |