[Bf-blender-cvs] [d71a7f7] temp-cycles-microdisplacement: Add compilation fixes for MSVC

Lukas Stockner noreply at git.blender.org
Tue Apr 12 18:46:11 CEST 2016


Commit: d71a7f79bd95e4858e76fac242086fc1a263e9ae
Author: Lukas Stockner
Date:   Mon Apr 11 22:52:49 2016 +0200
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rBd71a7f79bd95e4858e76fac242086fc1a263e9ae

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 3d5b697..6281d4b 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