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:
authorBastien Montagne <montagne29@wanadoo.fr>2017-05-28 18:48:59 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-05-28 18:48:59 +0300
commit8ead56c4c974ea3f7481be61c74a0bbd5b8cde83 (patch)
tree80a55f0ac146c8379a14397649c6d57623f5cf50 /intern/elbeem
parent6dfe56f01a2bac39e848316bcfa6882318768c3b (diff)
parentb947810291b16d3f304e2cd59f94c96c5f6e6f51 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/elbeem')
-rw-r--r--intern/elbeem/intern/mvmcoords.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/elbeem/intern/mvmcoords.h b/intern/elbeem/intern/mvmcoords.h
index 56d991aac6e..deeedcf9dd4 100644
--- a/intern/elbeem/intern/mvmcoords.h
+++ b/intern/elbeem/intern/mvmcoords.h
@@ -23,12 +23,10 @@
#define mvmFloat double
#ifdef WIN32
-#ifndef FREE_WINDOWS
#include "float.h"
#define isnan(n) _isnan(n)
#define finite _finite
#endif
-#endif
#ifdef sun
#include "ieeefp.h"