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:
authorDalai Felinto <dfelinto@gmail.com>2017-07-03 16:07:14 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-07-03 16:18:46 +0300
commitd97c3bc7ad13cb9e3ec2248ce035a62c28ac70f8 (patch)
tree6dc5b6169e1398b4dc53f5aefc7304cb13ccbcda /intern/elbeem
parent871325e26fe12efe8bf8a7042d94896f2f7faf6c (diff)
parenteb1532a86094ba5d59bf62b1fbd50f74a639d0a8 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/elbeem')
-rw-r--r--intern/elbeem/intern/isosurface.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/elbeem/intern/isosurface.cpp b/intern/elbeem/intern/isosurface.cpp
index b29c9e20358..de7bfe8e687 100644
--- a/intern/elbeem/intern/isosurface.cpp
+++ b/intern/elbeem/intern/isosurface.cpp
@@ -15,6 +15,7 @@
#include "particletracer.h"
#include <algorithm>
#include <stdio.h>
+#include <cmath>
#ifdef sun
#include "ieeefp.h"
@@ -25,6 +26,8 @@
#define round(x) (x)
#endif
+using std::isfinite;
+
/******************************************************************************
* Constructor
*****************************************************************************/