Commit: ad89f5a6db2885868aec72fe2b9ba32b71cfcbca
Author: Hugo Sales
Date: Sun Jun 9 10:27:29 2019 +0100
Branches: soc-2019-fast-io
https://developer.blender.org/rBad89f5a6db2885868aec72fe2b9ba32b71cfcbca
[Fast import/export] Fixed build issues on windows
===================================================================
M source/blender/editors/io/CMakeLists.txt
M source/blender/editors/io/intern/common.hpp
===================================================================
diff --git a/source/blender/editors/io/CMakeLists.txt
b/source/blender/editors/io/CMakeLists.txt
index c5f29d7f09f..5904d9f131f 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -32,7 +32,7 @@ set(INC
)
set(INC_SYS
-
+ ${BOOST_INCLUDE_DIR}
)
set(SRC
diff --git a/source/blender/editors/io/intern/common.hpp
b/source/blender/editors/io/intern/common.hpp
index a74eb4a8368..8e5e7752fe7 100644
--- a/source/blender/editors/io/intern/common.hpp
+++ b/source/blender/editors/io/intern/common.hpp
@@ -83,7 +83,8 @@ namespace common {
// Execute `start` and `end` and time it. Those functions should be
// specific to each exportter, but have the same signature as the two
above
bool time_export(bContext *C, ExportSettings * const settings,
- typeof(export_start) start, typeof(export_end) end);
+ void (*start)(bContext *C, ExportSettings * const
settings),
+ void (*end)(bContext *C, ExportSettings * const
settings);
const std::array<float, 3> calculate_normal(const Mesh * const mesh,
const MPoly &mp);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
