From bfb4dd0cdb00b23133fa7be12f4cba16ea32a75d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 13 Sep 2017 14:00:41 -0700 Subject: [PATCH] disable warning c4267 when including draco --- libraries/baking/src/FBXBaker.cpp | 10 ++++++++++ libraries/fbx/src/FBXReader_Mesh.cpp | 9 +++++++++ 2 files changed, 19 insertions(+) diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp index 79a5b9157b..5abb3feb0d 100644 --- a/libraries/baking/src/FBXBaker.cpp +++ b/libraries/baking/src/FBXBaker.cpp @@ -33,9 +33,19 @@ #include "FBXBaker.h" +#ifdef _WIN32 +#pragma warning( push ) +#pragma warning( disable : 4267 ) +#endif + #include #include +#ifdef _WIN32 +#pragma warning( pop ) +#endif + + FBXBaker::FBXBaker(const QUrl& fbxURL, TextureBakerThreadGetter textureThreadGetter, const QString& bakedOutputDir, const QString& originalOutputDir) : _fbxURL(fbxURL), diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp index 323ecac37b..fd9756b4c0 100644 --- a/libraries/fbx/src/FBXReader_Mesh.cpp +++ b/libraries/fbx/src/FBXReader_Mesh.cpp @@ -9,8 +9,17 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#ifdef _WIN32 +#pragma warning( push ) +#pragma warning( disable : 4267 ) +#endif + #include +#ifdef _WIN32 +#pragma warning( pop ) +#endif + #include #include #include