summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* LWSImporter: Fix direct memory leakupstream/kimkulling-fix_direct_leak_issue4231Kim Kulling2021-12-101-0/+1
* Merge pull request #4250 from assimp/kimkulling-fix_division_by_zero_issue4235-1Kim Kulling2021-12-101-5/+11
|\
| * Update HMPLoader.cppupstream/kimkulling-fix_division_by_zero_issue4235-1Kim Kulling2021-12-101-5/+11
|/
* Merge pull request #4249 from assimp/kimkulling-fix_nullptr_dereferencing_iss...Kim Kulling2021-12-101-0/+5
|\
| * Fix nullptr dereferencing from std::shared_ptrKim Kulling2021-12-101-0/+5
|/
* Merge pull request #4245 from assimp/kimkulling-fix-division-by-zero-issue4240Kim Kulling2021-12-071-21/+18
|\
| * Update PolyTools.hKim Kulling2021-12-071-3/+3
| * Fix division by zero in PointInTriangle2DKim Kulling2021-12-071-21/+18
|/
* Merge pull request #4219 from assimp/kimkulling-v5.1.3v5.1.3Kim Kulling2021-12-041-1/+1
|\
| * Update CMakeLists.txtKim Kulling2021-12-041-1/+1
|/
* Merge pull request #4217 from umlaeute/bugfix/x3d-extension-checkKim Kulling2021-12-013-10/+11
|\
| * X3D: simplistic attempt to avoid crashes due to nullptr accessIOhannes m zmölnig2021-12-011-1/+6
| * X3D: replace 'here' debugging printout by an assertion.IOhannes m zmölnig2021-12-011-3/+1
| * X3D: consistent initialization with nullptrIOhannes m zmölnig2021-12-011-3/+3
| * Fix file-extension check for X3D-filesIOhannes m zmölnig2021-12-011-3/+1
|/
* Merge pull request #4216 from inhosens/masterKim Kulling2021-12-012-2/+81
|\
| * Merge branch 'master' into masterKim Kulling2021-11-303-2/+8
| |\ | |/ |/|
* | Merge pull request #4211 from ms-maxvollmer/ms-maxvollmer/crashfixes2Kim Kulling2021-11-303-2/+8
|\ \
| * \ Merge branch 'master' into ms-maxvollmer/crashfixes2Kim Kulling2021-11-3022-37/+151
| |\ \ | |/ / |/| |
| * | Check that positions exist before accessing themMax Vollmer (Microsoft Havok)2021-11-261-1/+3
| * | Reject files with an invalid byteLength valueMax Vollmer (Microsoft Havok)2021-11-261-0/+4
| * | Ensure we don't access the vector with an out of bounds indexMax Vollmer (Microsoft Havok)2021-11-261-1/+1
| | * Interpolate euler rotations for quaternion animationsInho Lee2021-11-302-2/+81
| |/ |/|
* | Merge pull request #4193 from PencilAmazing/BlenderCollectionsKim Kulling2021-11-288-26/+151
|\ \
| * | Fix memory leaks in CollectionObject by making ob a weak pointer and removing...Pencil Amazing2021-11-263-13/+23
| * | Add a separate test case for Blender 276 and update Box.blend to be 293Pencil Amazing2021-11-265-1/+6
| * | Make Blender importer aware of collections, and use them when available. Also...Pencil Amazing2021-11-266-26/+136
|/ /
* | Merge pull request #4212 from assimp/kimkulling-remove_deprecated_datav5.1.2Kim Kulling2021-11-2614-11/+0
|\ \ | |/ |/|
| * Delete test/models/3DS/UVTransformTest directoryupstream/kimkulling-remove_deprecated_dataKim Kulling2021-11-2614-11/+0
|/
* Merge pull request #4207 from jakrams/msft-jakras-fix-corrupted-accessorKim Kulling2021-11-261-0/+5
|\
| * Prevent out-of-range memory writes by sparse accessorsJan Krassnigg2021-11-251-0/+5
|/
* Merge pull request #4195 from ruyo/fix-gltf2-sparse-indicesTypeKim Kulling2021-11-221-2/+3
|\
| * Merge branch 'master' into fix-gltf2-sparse-indicesTypeKim Kulling2021-11-221-2/+1
| |\ | |/ |/|
* | Merge pull request #4196 from Rodousse/fix_mingw_compile_flagsKim Kulling2021-11-221-2/+1
|\ \
| * | Use adviced c++ flag to supress warning on mingwRobin Dousse2021-11-221-2/+1
|/ /
| * Fixed an incorrect indeiciesType in the glTF2 sparse accessor.ruyo2021-11-211-2/+3
|/
* Merge pull request #4185 from rhabacker/win_dll_so_versionv5.1.1Kim Kulling2021-11-201-0/+6
|\
| * Merge branch 'master' into win_dll_so_versionKim Kulling2021-11-206-42/+116
| |\ | |/ |/|
* | Merge pull request #4184 from RichardTea/deprecated_gltfpbr_macrosKim Kulling2021-11-206-42/+116
|\ \
| * \ Merge branch 'master' into deprecated_gltfpbr_macrosKim Kulling2021-11-204-63/+105
| |\ \ | |/ / |/| |
| * | Only issue compile warning on gcc and msvcRichardTea2021-11-171-1/+1
| * | Redefine deprecated glTF-specific PBR material macrosRichardTea2021-11-166-42/+116
| | * Append '-SOVERSION' to DLL base file name for mingw builds to match common styleRalf Habacker2021-11-181-0/+6
| |/ |/|
* | Merge pull request #4187 from RichardTea/collada_value_not_attrib_4179Kim Kulling2021-11-173-46/+83
|\ \
| * | Read the Value, not the AttributeRichardTea2021-11-173-45/+82
| * | apply clangformatRichardTea2021-11-171-1/+1
|/ /
* | Merge pull request #4173 from jdumas/jdumas/ziplibKim Kulling2021-11-171-17/+22
|\ \ | |/ |/|
| * Merge branch 'master' into jdumas/ziplibKim Kulling2021-11-173-17/+11
| |\ | |/ |/|
* | Merge pull request #4181 from assimp/kimkulling-prepare_installerKim Kulling2021-11-152-11/+11
|\ \
| * | Update script_x86.issKim Kulling2021-11-151-7/+7