fix vs2013 specific warnings.
parent
d1afd97ec2
commit
097d2faeea
|
@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
|
||||||
|
|
||||||
Copyright (c) 2006-2020, assimp team
|
Copyright (c) 2006-2020, assimp team
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use of this software in source and binary forms,
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
@ -76,6 +74,11 @@ Here we implement only the C++ interface (Assimp::Exporter).
|
||||||
|
|
||||||
namespace Assimp {
|
namespace Assimp {
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# pragma warning( disable : 4800 )
|
||||||
|
#endif // _WIN32
|
||||||
|
|
||||||
|
|
||||||
// PostStepRegistry.cpp
|
// PostStepRegistry.cpp
|
||||||
void GetPostProcessingStepInstanceList(std::vector< BaseProcess* >& out);
|
void GetPostProcessingStepInstanceList(std::vector< BaseProcess* >& out);
|
||||||
|
|
||||||
|
|
|
@ -53,6 +53,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
using namespace Assimp;
|
using namespace Assimp;
|
||||||
void mydummy() {}
|
void mydummy() {}
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# pragma warning( disable : 4709 )
|
||||||
|
#endif // _WIN32
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
/** Subdivider stub class to implement the Catmull-Clarke subdivision algorithm. The
|
/** Subdivider stub class to implement the Catmull-Clarke subdivision algorithm. The
|
||||||
* implementation is basing on recursive refinement. Directly evaluating the result is also
|
* implementation is basing on recursive refinement. Directly evaluating the result is also
|
||||||
|
|
|
@ -101,7 +101,10 @@ typedef uint16_t M3D_INDEX;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# pragma warning(push)
|
# pragma warning(push)
|
||||||
# pragma warning(disable : 4127 5573 4505 4244 4403 5744 4701 4703)
|
# pragma warning(disable : 4127 4505 4244 4403 5744 4701 4703)
|
||||||
|
# if (_MSC_VER > 1800 )
|
||||||
|
# pragma warning(disable : 5573 )
|
||||||
|
# endif
|
||||||
#endif // _WIN32
|
#endif // _WIN32
|
||||||
|
|
||||||
/*** File format structures ***/
|
/*** File format structures ***/
|
||||||
|
|
|
@ -68,6 +68,10 @@ namespace Assimp {
|
||||||
namespace MDL {
|
namespace MDL {
|
||||||
namespace HalfLife {
|
namespace HalfLife {
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
# pragma warning(disabe : 4706)
|
||||||
|
#endif // _WIN32
|
||||||
|
|
||||||
// ------------------------------------------------------------------------------------------------
|
// ------------------------------------------------------------------------------------------------
|
||||||
HL1MDLLoader::HL1MDLLoader(
|
HL1MDLLoader::HL1MDLLoader(
|
||||||
aiScene *scene,
|
aiScene *scene,
|
||||||
|
|
Loading…
Reference in New Issue