Commit Graph

10655 Commits (fe732134208c86d02fa64bd98f0767f2485b2e9f)

Author SHA1 Message Date
Kim Kulling e70b05b41a
Merge pull request #4057 from Madrich/master
Double Precision Issue
2021-09-07 12:49:04 +02:00
Kim Kulling 768024d5a0
Merge branch 'master' into master 2021-09-07 11:39:34 +02:00
Kim Kulling 30c6606718
Merge pull request #4056 from Dig-Doug/xgl-fix
XGLImporter: Compiler warning fix
2021-09-07 10:12:40 +02:00
Kim Kulling 74e8a6a366
Merge branch 'master' into xgl-fix 2021-09-07 09:03:40 +02:00
Kim Kulling 209167c41f
Merge pull request #4055 from ms-maxvollmer/ms-maxvollmer/code_improvements
Fixes issues our internal compliance and code quality tool found
2021-09-02 11:33:10 +02:00
Max Vollmer (Microsoft Havok) bf8e36ae28 Fixed typo 2021-09-02 10:07:28 +01:00
Max Vollmer (Microsoft Havok) 72ea80b41f Revert last change (gltf2::Ref type is not a pointer and has a bool() operator) 2021-09-02 10:00:56 +01:00
Kim Kulling d710d0700f
Make nullptr test more explicit. 2021-09-02 10:10:42 +02:00
Max Vollmer (Microsoft Havok) 4c86772091 Added another nullptr safety check 2021-09-02 08:27:03 +01:00
Madrich 9b535d1c15 Fix Double Precision errors/warnings 2021-08-31 12:59:31 +02:00
Madrich 43a3c4a05e
Merge branch 'assimp:master' into master 2021-08-31 11:55:29 +02:00
Kim Kulling 155db25883
Merge branch 'master' into ms-maxvollmer/code_improvements 2021-08-31 08:55:47 +02:00
Kim Kulling f888910a2a
Merge pull request #4053 from kovacsv/compressed_json
Add export property for assimp json exporter to write compressed json
2021-08-31 08:51:23 +02:00
Doug Roeper 96f0787f51
Fix the -Werror=unused-but-set-parameter warning by removing the skipFirst variable. 2021-08-30 18:15:37 -04:00
Max Vollmer (Microsoft Havok) 51f294c587 Fixes issues our internal compliance and code quality tool found:
* Adds nullptr checks and asserts to protect certain code paths
* Fixes wrong integer type in a printf call
* Adds const to const values
* Prevents integer overflow with explicit casts
2021-08-30 14:59:17 +01:00
Viktor Kovacs 82d8c4e849
Merge branch 'master' into compressed_json 2021-08-30 10:11:03 +02:00
Kim Kulling 5e86fead8e
Merge pull request #4029 from assimp/issue_3398
Add support for M3F Embedded textures
2021-08-30 08:46:33 +02:00
Kim Kulling 38c611a02c
Update ColladaLoader.cpp 2021-08-30 08:33:35 +02:00
Kim Kulling e2c2a60c45 Remove not used attribute 2021-08-29 18:41:07 +02:00
Kim Kulling c9d35b6edc Remove C++14 feature. 2021-08-29 18:35:44 +02:00
Kim Kulling ceafa95610 Remove unused header 2021-08-29 10:36:02 +02:00
kirillsurkov 5ca2cbb7ae Fix MinGW build 2021-08-28 20:04:37 +03:00
Kim Kulling c9b76f5255 Decrease xml-serializer complexity 2021-08-28 14:20:12 +02:00
Kim Kulling df739f00dd
Merge branch 'master' into issue_3398 2021-08-28 13:56:50 +02:00
Kim Kulling 69051bbc2c Add missing docu 2021-08-28 13:46:41 +02:00
Kim Kulling a7bc858698
Fix review finding. 2021-08-28 13:36:57 +02:00
Kim Kulling 3e090b21f5 Fix setup of embedded texture loading 2021-08-28 13:33:25 +02:00
Viktor Kovacs b9b62d106c
Merge branch 'master' into compressed_json 2021-08-27 18:18:28 +02:00
kovacsv b39f38b73c Add export property for assimp json exporter to write compressed json (without whitespaces). 2021-08-27 18:17:27 +02:00
Kim Kulling 6841397798
Merge pull request #4051 from assimp/kimkulling-kill_irrXml-dependency
Delete FindIrrXML.cmake
2021-08-27 15:07:00 +02:00
Kim Kulling 999192489c
Delete FindIrrXML.cmake
- Deprecated
2021-08-27 14:52:48 +02:00
Kim Kulling afd0f65ceb
Merge pull request #4050 from assimp/kimkulling-fuzzer_issue_24553
Fix possible overrun
2021-08-27 14:19:32 +02:00
Kim Kulling a45878c41a
Fix possible overrun
- closes https://github.com/assimp/assimp/issues/3425
2021-08-27 14:04:00 +02:00
Kim Kulling e5bf7f7e07
Merge pull request #4049 from assimp/kimkulling-patch-fuzzer_Issue_25058
Handle  empty keys
2021-08-27 11:01:49 +02:00
Kim Kulling eabfc05bbb
Handle empty keys 2021-08-27 10:41:25 +02:00
Kim Kulling e7085199f2
Merge pull request #4045 from assimp/issue_4042
Enable Viewer only for VS-Builds
2021-08-24 19:37:18 +02:00
Kim Kulling fe31ac295c
Merge branch 'master' into issue_4042 2021-08-24 19:24:16 +02:00
Kim Kulling a71baaeedf Enable Viewer only for VS-Builds 2021-08-24 19:22:15 +02:00
Kim Kulling 7cc076b27a
Merge pull request #4044 from kovacsv/m3d_crash
Fix M3D import crash and memory leak.
2021-08-24 15:06:50 +02:00
kovacsv cb262dab5e Revert test back to the exact same version. 2021-08-24 11:02:09 +02:00
kovacsv 37ba067839 Revert back test, because the new one revealed an undefined behavior error. 2021-08-24 09:09:35 +02:00
kovacsv 0590a39159 Fix M3D import crash and memory leak.
The same default material pointer was assigned to all the materials in the scene, so poor destructor tried to free the same pointer multiple times.
2021-08-24 07:26:20 +02:00
Kim Kulling d2b7e9c38c
Merge pull request #4040 from assimp/build_fixes
Build fixes
2021-08-20 21:23:42 +02:00
Kim Kulling f24101546b
Fix typo in path 2021-08-20 21:02:42 +02:00
Kim Kulling 1452b33cbd
Merge branch 'master' into build_fixes 2021-08-20 20:58:35 +02:00
kimmi 18f58947a4 CMake: move hunter cmake-scripts into cmake-modules 2021-08-20 20:42:02 +02:00
kimmi 38dcd3583c Fix compiler warnings: comparison signed unsigned. 2021-08-20 20:20:47 +02:00
kimmi c396bc78b1 closes https://github.com/assimp/assimp/issues/3951: Use using directive to define type. 2021-08-20 19:40:04 +02:00
Kim Kulling 7fa2bfbb70
Merge pull request #4036 from yzthr/master
fix sample build error
2021-08-20 19:30:37 +02:00
Kim Kulling 21603c9f83
Merge branch 'master' into master 2021-08-20 19:18:54 +02:00