Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into extras_property_callback

Browse Source
This commit is contained in:
Kim Kulling
2020-07-11 22:46:19 +02:00
committed by GitHub
parent 108b3a62e5 1324b4b27d
commit 306e03d497
16 changed files with 27 additions and 730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/AssetLib/3DS/3DSHelper.h
View File

@@ -321,7 +321,7 @@ public:
struct Face : public FaceWithSmoothingGroup {
};
#ifdef _WIN32
#if _MSC_VER > 1920
#pragma warning(disable : 4315)
#endif

2
code/AssetLib/IFC/IFCReaderGen_2x3.h
View File

@@ -45,7 +45,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "AssetLib/Step/STEPFile.h"
#ifdef _WIN32
#if _MSC_VER > 1920
# pragma warning( disable : 4512 )
#endif // _WIN32

4
code/AssetLib/M3D/m3d.h
View File

@@ -85,7 +85,9 @@ typedef uint16_t M3D_INDEX;
#define M3D_BONEMAXLEVEL 8
#endif
#ifndef _MSC_VER
#ifndef _inline
#define _inline __inline__
#endif
#define _pack __attribute__((packed))
#define _unused __attribute__((unused))
#else
@@ -99,7 +101,7 @@ typedef uint16_t M3D_INDEX;
#define _register
#endif
#ifdef _WIN32
#if _MSC_VER > 1920
# pragma warning(push)
# pragma warning(disable : 4100 4127 4189 4505 4244 4403 4701 4703)
# if (_MSC_VER > 1800 )

6
code/AssetLib/MDL/HalfLife/HL1MDLLoader.cpp
View File

@@ -68,8 +68,8 @@ namespace Assimp {
namespace MDL {
namespace HalfLife {
#ifdef _WIN32
# pragma warning(disable : 4706)
#if _MSC_VER > 1920
# pragma warning(disable : 4706)
#endif // _WIN32
// ------------------------------------------------------------------------------------------------
@@ -829,7 +829,7 @@ void HL1MDLLoader::read_meshes() {
}
} else {
for (int faceIdx = 0; faceIdx < num_faces; ++faceIdx) {
if (i & 1) {
if (faceIdx & 1) {
// Preserve winding order.
mesh_faces.push_back(HL1MeshFace{
tricmds[faceIdx + 1],

6
code/AssetLib/Step/STEPFile.h
View File

@@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/DefaultLogger.hpp>
#ifdef _WIN32
#if _MSC_VER > 1920
# pragma warning(push)
# pragma warning(disable : 4127 4456 4245 4512 )
#endif // _WIN32
@@ -727,7 +727,7 @@ struct InternGenericConvert<Maybe<T>> {
}
};
#ifdef _WIN32
#if _MSC_VER > 1920
#pragma warning(push)
#pragma warning(disable : 4127)
#endif // _WIN32
@@ -960,7 +960,7 @@ private:
const EXPRESS::ConversionSchema *schema;
};
#ifdef _WIN32
#if _MSC_VER > 1920
#pragma warning(pop)
#endif // _WIN32