[Bf-blender-cvs] [0757c7fa081] soc-2019-fast-io: [Fast import/export] Fixed compile error
Hugo Sales
noreply at git.blender.org
Wed May 22 13:40:16 CEST 2019
Commit: 0757c7fa081b1ca70285536b83759f3d69b29053
Author: Hugo Sales
Date: Wed May 22 12:02:41 2019 +0100
Branches: soc-2019-fast-io
https://developer.blender.org/rB0757c7fa081b1ca70285536b83759f3d69b29053
[Fast import/export] Fixed compile error
Including BKE_mesh.h before BLI_sys_types.h creates a compile error, where uint isn't defined.
This is strange and I'm not sure where it comes from, but I think it's a consequence of some change in master.
===================================================================
M source/blender/editors/io/intern/obj.cpp
M source/blender/editors/io/intern/stl.cpp
===================================================================
diff --git a/source/blender/editors/io/intern/obj.cpp b/source/blender/editors/io/intern/obj.cpp
index 66d8e616171..3a5a255685e 100644
--- a/source/blender/editors/io/intern/obj.cpp
+++ b/source/blender/editors/io/intern/obj.cpp
@@ -1,5 +1,9 @@
extern "C" {
+#include "BLI_sys_types.h"
+#include "BLI_math.h"
+#include "BLT_translation.h"
+
#include "BKE_mesh.h"
#include "BKE_mesh_runtime.h"
#include "BKE_global.h"
@@ -20,10 +24,6 @@ extern "C" {
#include "WM_api.h"
#include "WM_types.h"
-#include "BLI_math.h"
-
-#include "BLT_translation.h"
-
#include "ED_object.h"
#include "bmesh.h"
#include "bmesh_tools.h"
diff --git a/source/blender/editors/io/intern/stl.cpp b/source/blender/editors/io/intern/stl.cpp
index 3b817e7bea6..b38cae4af3b 100644
--- a/source/blender/editors/io/intern/stl.cpp
+++ b/source/blender/editors/io/intern/stl.cpp
@@ -1,5 +1,9 @@
extern "C" {
+#include "BLI_math.h"
+#include "BLI_sys_types.h"
+#include "BLT_translation.h"
+
#include "BKE_mesh.h"
#include "BKE_mesh_runtime.h"
#include "BKE_global.h"
@@ -29,10 +33,6 @@ extern "C" {
#include "WM_api.h"
#include "WM_types.h"
-#include "BLI_math.h"
-
-#include "BLT_translation.h"
-
#include "ED_object.h"
#include "bmesh.h"
More information about the Bf-blender-cvs
mailing list