[Bf-blender-cvs] [a66bea0] temp-cycles-microdisplacement: Add compilation fixes for MSVC
Lukas Stockner
noreply at git.blender.org
Mon Apr 11 22:54:28 CEST 2016
Commit: a66bea0a494c9ff6ab796cf538194723611f3b92
Author: Lukas Stockner
Date: Mon Apr 11 22:52:49 2016 +0200
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rBa66bea0a494c9ff6ab796cf538194723611f3b92
Add compilation fixes for MSVC
===================================================================
M intern/cycles/render/mesh_subdivision.cpp
===================================================================
diff --git a/intern/cycles/render/mesh_subdivision.cpp b/intern/cycles/render/mesh_subdivision.cpp
index ae0dc3e..cafdae5 100644
--- a/intern/cycles/render/mesh_subdivision.cpp
+++ b/intern/cycles/render/mesh_subdivision.cpp
@@ -14,6 +14,13 @@
* limitations under the License.
*/
+/* TODO: Move the OpenSubdiv includes to a separate header. */
+#ifdef _MSC_VER
+# include <iso646.h>
+# define _USE_MATH_DEFINES
+# include <math.h>
+#endif
+
#include <opensubdiv/far/topologyDescriptor.h>
#include <opensubdiv/far/primvarRefiner.h>
#include <opensubdiv/far/patchTableFactory.h>
More information about the Bf-blender-cvs
mailing list