[Bf-blender-cvs] [1095760] temp-cycles-microdisplacement: More build fixes

Mai Lavelle noreply at git.blender.org
Mon Jul 18 00:36:27 CEST 2016


Commit: 109576083c006c3b7745600bfb37941b61ebf555
Author: Mai Lavelle
Date:   Sun Jul 17 18:34:33 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB109576083c006c3b7745600bfb37941b61ebf555

More build fixes

Should be able to revert this one after OpenSubdiv version bump

===================================================================

M	intern/cycles/subd/subd_patch_table.h

===================================================================

diff --git a/intern/cycles/subd/subd_patch_table.h b/intern/cycles/subd/subd_patch_table.h
index da613d3..c8c7ecf 100644
--- a/intern/cycles/subd/subd_patch_table.h
+++ b/intern/cycles/subd/subd_patch_table.h
@@ -21,6 +21,10 @@
 #include "util_vector.h"
 
 #ifdef WITH_OPENSUBDIV
+#ifdef _MSC_VER
+#  include "iso646.h"
+#endif
+
 #include <opensubdiv/far/patchTable.h>
 #endif




More information about the Bf-blender-cvs mailing list