Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,200 Commits 19 Branches 43 Tags
4f06c41802ff2dfadbeef9890eebf54433499d94
Commit Graph
6035 Commits
Author SHA1 Message Date
Kim Kulling cbc4459dda Fix compile error: missing var 2022-01-19 22:03:11 +01:00
Kim Kulling 43763f53d6 Fix compile error: missing var 2022-01-19 22:00:53 +01:00
Kim Kulling 15b08f643a Fix warning: unused variable 2022-01-19 21:55:24 +01:00
Kim Kulling 17d5633a5b Add missing SImpleExtensionCheck 2022-01-19 21:42:14 +01:00
Kim Kulling 4cb76e6a18 Update UnrealLoader.cpp 2022-01-18 22:29:55 +01:00
Kim Kulling 12b01dd575 Update SMDLoader.cpp 2022-01-18 22:28:54 +01:00
Kim Kulling 7b24437f06 Update SIBImporter.cpp 2022-01-18 22:27:19 +01:00
Kim Kulling ec63fe74ee Update RawLoader.cpp 2022-01-18 22:26:16 +01:00
Kim Kulling 088658b359 Update Q3BSPFileImporter.cpp 2022-01-18 22:25:43 +01:00
Kim Kulling b4dee9220d Update Q3BSPFileImporter.cpp 2022-01-18 22:25:22 +01:00
Kim Kulling ffc13f18ba NFF: reenable canRead 2022-01-18 22:24:11 +01:00
Kim Kulling 331cb5ac72 Update M3DImporter.cpp 2022-01-18 22:23:01 +01:00
Kim Kulling c3b91dd766 C4D. Fix merge conflicts 2022-01-18 22:21:58 +01:00
Kim Kulling ea5996307a Update B3DImporter.cpp 2022-01-18 22:20:37 +01:00
Kim Kulling efd1d36aa9 Merge branch 'master' into krishty-new-file-detection 2022-01-18 22:17:50 +01:00
Kim Kulling 959af1ac4d Revert change 2022-01-18 21:37:49 +01:00
Kim Kulling 7350baea93 Revert change 2022-01-18 21:36:55 +01:00
Kim Kulling cf47411742 Revert change 2022-01-18 21:36:02 +01:00
Kim Kulling 1e80630d5d Revert change. 2022-01-18 21:35:09 +01:00
Kim Kulling 037732c429 Revert change 2022-01-18 21:34:18 +01:00
Kim Kulling cff213d4dd Revert change 2022-01-18 21:33:05 +01:00
Kim Kulling 9d0006fecb Revert change 2022-01-18 21:32:06 +01:00
Kim Kulling 5af79cac1d Fix unittests + small refactorings 2022-01-18 21:23:43 +01:00
Jeremy Sigrist 59f28e168e Merge branch 'master' into jere9309/read_collada_materials 2022-01-18 09:55:33 -08:00
Kim Kulling 6e50b04ae0 Merge branch 'master' into IQM 2022-01-17 18:33:37 +01:00
Kim Kulling f16e4fadc7 Merge branch 'master' into patch-1 2022-01-17 18:18:16 +01:00
Ben Sewell 415b0e19d9 Changes for gcc compatibility 2022-01-17 16:39:50 +00:00
Ben Sewell 65f2353105 IFC Reading: Fix opening reading. 2022-01-17 15:49:11 +00:00
Kim Kulling cbde086bfb Merge branch 'krishty-new-file-detection' of https://github.com/assimp/assimp into krishty-new-file-detection 2022-01-16 20:58:07 +01:00
Kim Kulling acd70b35a0 Fix merge issues 2022-01-16 20:57:56 +01:00
Kim Kulling 6ad7505376 Merge branch 'master' into krishty-new-file-detection 2022-01-16 20:43:57 +01:00
Kim Kulling 05746acb07 Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection 2022-01-16 20:41:24 +01:00
Viktor Kovacs c8ab39dd04 Merge branch 'master' into common_base64 2022-01-15 23:42:56 +01:00
Kim Kulling d3e24196c0 Merge branch 'master' into so-unloading 2022-01-13 20:19:23 +01:00
Jeremy Sigrist 5aac72791d Merge branch 'master' into jere9309/read_collada_materials 2022-01-12 10:12:58 -08:00
Jeremy Sigrist e671d087e1 Collada: Read all instance_material child nodes 2022-01-12 09:52:12 -08:00
Viktor Kovacs c71f4bc95a Merge branch 'master' into common_base64 2022-01-11 18:46:08 +01:00
tanolino f8abb015de Merge branch 'master' into patch-1 2022-01-11 09:55:19 +01:00
Kim Kulling d68224f2ed Merge branch 'master' into patch-1 2022-01-10 23:45:03 +01:00
Kim Kulling f63b10bf45 OpenGEX: Fix usage of texture specular token 2022-01-10 21:22:44 +01:00
Viktor Kovacs 6b9732721a Merge branch 'assimp:master' into common_base64 2022-01-10 21:15:31 +01:00
Kim Kulling 50c7301a38 Update copyrights 2022-01-10 21:13:43 +01:00
Ben Wolsieffer 629c8850ec Fix imported target include directory 
Fix the imported target include directory when the headers are not installed in '${CMAKE_INSTALL_PREFIX}/include'.
 2022-01-09 20:59:14 -05:00
Kim Kulling 8cb5ab69b0 Merge branch 'master' into fix-bone-fit-check 2022-01-08 11:35:59 +01:00
Kim Kulling 776130534b Fix nullptr-dereferencing 
- Fix a possible nullptr-exception.
 2022-01-06 22:35:32 +01:00
Alex Rebert b14b34d2b8 LWSLoader: Fix out of bounds iterator access 
Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38947
Fix #4222
 2022-01-05 15:43:16 -05:00
Alex Rebert 310c81aaa2 Add support for spanned archives 
Without it, assimp would crash on some inputs by jumping to a NULL
opendisk function. This commit adds an opendisk implementation, which
required adding a filename member to ZipFile.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38873
Fix #4229
 2022-01-05 15:43:10 -05:00
Alex Rebert 34d8fba100 Fix stack overflow in ZipArchiveIOSystem::MapArchive 
The function allocates a filename buffer of 256, and copies the filename
extracted from the zip file into it. However, a filename might be larger
than 256 characters, in which case the function would write out of bounds.

This commit skips any file whose name is larger than 256 to avoid the
overflow.

Fix https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38870
Fix #4228
 2022-01-05 10:01:46 -05:00
tanolino 089fc7311a GCC might have an issue with value type Errors 2022-01-05 10:34:27 +01:00
tanolino 04d2d13172 Locale independent meter scale 
`XmlParser::getRealAttribute(...)` will call `strtod` (or `wcstod`) which are both locale dependent. So on a German locale system a scale of 0.01 meter will be parsed to 0. In order to avoid that I use the `fast_atoreal_move<ai_real>()` method.
 2022-01-05 10:10:38 +01:00