Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 12:37:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

disable warning c4267 when including draco

Browse source
This commit is contained in:
Stephen Birarda 2017-09-13 14:00:41 -07:00
parent c365e1718e
commit bfb4dd0cdb
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/baking/src/FBXBaker.cpp
View file

@ -33,9 +33,19 @@
#include "FBXBaker.h" #include "FBXBaker.h"
#ifdef _WIN32
#pragma warning( push )
#pragma warning( disable : 4267 )
#endif
#include <draco/mesh/triangle_soup_mesh_builder.h> #include <draco/mesh/triangle_soup_mesh_builder.h>
#include <draco/compression/encode.h> #include <draco/compression/encode.h>
#ifdef _WIN32
#pragma warning( pop )
#endif
FBXBaker::FBXBaker(const QUrl& fbxURL, TextureBakerThreadGetter textureThreadGetter, FBXBaker::FBXBaker(const QUrl& fbxURL, TextureBakerThreadGetter textureThreadGetter,
const QString& bakedOutputDir, const QString& originalOutputDir) : const QString& bakedOutputDir, const QString& originalOutputDir) :
_fbxURL(fbxURL), _fbxURL(fbxURL),

9
libraries/fbx/src/FBXReader_Mesh.cpp
View file

@ -9,8 +9,17 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // 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 <draco/compression/decode.h> #include <draco/compression/decode.h>
#ifdef _WIN32
#pragma warning( pop )
#endif
#include <iostream> #include <iostream>
#include <QBuffer> #include <QBuffer>
#include <QDataStream> #include <QDataStream>