v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,689 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

11689 Commits (fa4273ee1f069058a9bc151465d10726fc128986)

Author SHA1 Message Date
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 6439305379
Remove dead code 2021-08-24 20:53:55 +02:00
Kim Kulling 61ba320a04
Merge branch 'master' into master 2021-08-24 20:53:04 +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
Kim Kulling aa90f51849
Merge pull request #4037 from kovacsv/master 
Mingw build fix
 2021-08-19 19:48:12 +02:00
kovacsv 468aa50aed mingw build fix 2021-08-19 13:50:26 +02:00
陶浩然 d926c5ed61 fix sample build error 2021-08-19 18:49:43 +08:00
Kim Kulling ceced70df0
Merge pull request #4026 from Mykhailo418/master 
Fix: incorrect reading of PBR properties in FBX
 2021-08-18 10:47:20 +02:00
Kim Kulling f3903e34a4
Merge branch 'master' into master 2021-08-18 07:32:16 +02:00
Kim Kulling 4766d75943
Merge pull request #4027 from uerobert/clang13 
Add missing diagnostic pragmas and remove unused code
 2021-08-17 17:39:02 +02:00
Kim Kulling a486a698e8
Merge branch 'master' into clang13 2021-08-16 21:35:59 +02:00
Kim Kulling 4ce638838d
Merge pull request #4032 from ms-maxvollmer/ms-maxvollmer/crash_fixes_08_2021 
Crash fixes
 2021-08-16 21:35:12 +02:00
Kim Kulling a850f312ac
Merge branch 'master' into ms-maxvollmer/crash_fixes_08_2021 2021-08-16 21:00:07 +02:00
Kim Kulling c28aab2ed6
Merge pull request #4017 from mahiuchun/bound 
Obj: make a predicate more robust.
 2021-08-16 20:59:37 +02:00
Kim Kulling 27231c3f52
Merge branch 'master' into bound 2021-08-16 20:48:17 +02:00
Kim Kulling 4caba7de8a
Merge pull request #4010 from krishty/fix-logger-comments 
fix comments
 2021-08-16 20:47:31 +02:00
Max Vollmer (Microsoft Havok) c1e830cf3b The GLTF2 specs aren't very specific about the restrictions of the number of keyframes in sampler input and output. It seems logical that they should be the same, but there is an official sample model from Khronos where output has more keyframes. I thus assume that the GLTF2 standard allows more keyframes in output, but not in input. Fixed the check accordingly. 2021-08-13 17:46:10 +01:00
Max Vollmer (Microsoft Havok) de2f5cf021 Crash fixes 2021-08-13 16:26:42 +01:00
Spectrum76 4d8c518ed0
Merge branch 'assimp:master' into master 2021-08-13 20:43:35 +05:30
Kim Kulling 4b1ff645e3 closes https://github.com/assimp/assimp/issues/3398: Add support for embedded textures 2021-08-12 21:13:07 +02:00
Mykhailo Smoliakov 26defda671
Merge branch 'master' into master 2021-08-12 08:20:59 +03:00
Robert Ubiñas b95df54225 Remove unused code 2021-08-11 19:33:10 -04:00
Robert Ubiñas 58cae73401 Disable diagnostic for LogStream comparator 2021-08-11 19:32:26 -04:00
Robert Ubiñas 69c152d7c1 Add missing diagnostic push 2021-08-11 18:57:21 -04:00
krishty aac77e58b6
Merge branch 'master' into fix-logger-comments 2021-08-11 12:16:58 +02:00
Mykhailo Smoliakov c3fcbfd2c1 Fix issue of incorrect reading of PBR properties such as base and emissive color in FBX 2021-08-11 08:54:34 +03:00
Kim Kulling fcc7ad52a1
Merge pull request #4009 from krishty/fix-indent 
style fix: indentation
 2021-08-11 00:35:08 +02:00
Kim Kulling a16cd95b16
Merge branch 'master' into fix-indent 2021-08-10 21:39:13 +02:00
Kim Kulling 843e16868c
Merge pull request #4008 from krishty/no-empty-string-literals 
style fix – initializing and assigning empty std::string properly
 2021-08-10 21:38:46 +02:00
Kim Kulling a55518f6fc
Merge branch 'master' into no-empty-string-literals 2021-08-10 20:41:40 +02:00
Kim Kulling 58f91000c8
Merge pull request #4007 from krishty/trim-trailing-whitespace 
removed trailing spaces and tabs from source and text
 2021-08-09 23:26:38 +02:00
Kim Kulling 89eadb934f
Merge branch 'master' into trim-trailing-whitespace 2021-08-09 21:24:22 +02:00
Kim Kulling 89d17d1ea8
Merge pull request #4001 from xiaohunqupo/master 
StepExporter support polygon mesh
 2021-08-09 21:23:51 +02:00
Kim Kulling 0aa36ee550
Merge branch 'master' into master 2021-08-07 12:06:23 +02:00