From 5b6e2aae5a85d9d4ff445ba38e088616199d6606 Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 9 Nov 2018 11:07:45 -0800 Subject: [PATCH] Remove/move some unused serializer imports --- interface/src/ModelPackager.cpp | 1 + interface/src/ModelPropertiesDialog.h | 2 +- libraries/baking/src/ModelBaker.cpp | 1 - tools/vhacd-util/src/VHACDUtil.cpp | 2 ++ tools/vhacd-util/src/VHACDUtil.h | 4 ++-- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp index 5b3b53a40c..7e63085d1d 100644 --- a/interface/src/ModelPackager.cpp +++ b/interface/src/ModelPackager.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include "ModelSelector.h" diff --git a/interface/src/ModelPropertiesDialog.h b/interface/src/ModelPropertiesDialog.h index 7068d5cb76..7c0f9d86c1 100644 --- a/interface/src/ModelPropertiesDialog.h +++ b/interface/src/ModelPropertiesDialog.h @@ -14,7 +14,7 @@ #include -#include +#include #include #include "ui/ModelsBrowser.h" diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp index 646f1bc010..34f302b501 100644 --- a/libraries/baking/src/ModelBaker.cpp +++ b/libraries/baking/src/ModelBaker.cpp @@ -13,7 +13,6 @@ #include -#include #include #ifdef _WIN32 diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp index 89794bf40a..9401da4314 100644 --- a/tools/vhacd-util/src/VHACDUtil.cpp +++ b/tools/vhacd-util/src/VHACDUtil.cpp @@ -15,6 +15,8 @@ #include #include +#include +#include // FBXSerializer jumbles the order of the meshes by reading them back out of a hashtable. This will put diff --git a/tools/vhacd-util/src/VHACDUtil.h b/tools/vhacd-util/src/VHACDUtil.h index 7a6f2f1db6..0fb70e8af7 100644 --- a/tools/vhacd-util/src/VHACDUtil.h +++ b/tools/vhacd-util/src/VHACDUtil.h @@ -18,10 +18,10 @@ #include #include //c++11 feature #include -#include -#include #include +#include + namespace vhacd { class VHACDUtil { public: