[Bf-blender-cvs] [0822ec6fbf9] soc-2019-fast-io: [Fast import/export] Really fixed build issues on windows
Hugo Sales
noreply at git.blender.org
Sun Jun 9 11:50:21 CEST 2019
Commit: 0822ec6fbf9aa189a7a791dc9cbd1be43d6e3ee6
Author: Hugo Sales
Date: Sun Jun 9 10:50:13 2019 +0100
Branches: soc-2019-fast-io
https://developer.blender.org/rB0822ec6fbf9aa189a7a791dc9cbd1be43d6e3ee6
[Fast import/export] Really fixed build issues on windows
===================================================================
M source/blender/editors/io/intern/common.cpp
M source/blender/editors/io/intern/common.hpp
===================================================================
diff --git a/source/blender/editors/io/intern/common.cpp b/source/blender/editors/io/intern/common.cpp
index fe7ce15712f..4dbecaeceef 100644
--- a/source/blender/editors/io/intern/common.cpp
+++ b/source/blender/editors/io/intern/common.cpp
@@ -212,7 +212,8 @@ namespace common {
}
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) {
auto f = std::chrono::steady_clock::now();
start(C, settings);
auto ret = end(C, settings);
diff --git a/source/blender/editors/io/intern/common.hpp b/source/blender/editors/io/intern/common.hpp
index 8e5e7752fe7..f3719a556ad 100644
--- a/source/blender/editors/io/intern/common.hpp
+++ b/source/blender/editors/io/intern/common.hpp
@@ -84,7 +84,7 @@ namespace common {
// specific to each exportter, but have the same signature as the two above
bool time_export(bContext *C, ExportSettings * const settings,
void (*start)(bContext *C, ExportSettings * const settings),
- void (*end)(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);
More information about the Bf-blender-cvs
mailing list