Merge branch 'master' into extras_property_callback

2020-07-11 22:46:19 +02:00
parent 108b3a62e5 1324b4b27d
commit 306e03d497
16 changed files with 27 additions and 730 deletions
--- a/code/Common/Exporter.cpp
+++ b/code/Common/Exporter.cpp
@@ -74,8 +74,8 @@ Here we implement only the C++ interface (Assimp::Exporter).

 namespace Assimp {

-#ifdef _WIN32
-#    pragma warning( disable : 4800 ) 
+#if _MSC_VER > 1920
+#    pragma warning( disable : 4800 )
 #endif // _WIN32