Commit Graph

9015 Commits (9cad10a99553c1eafd299f68649f15433659fbb4)

Author SHA1 Message Date
kimkulling d40a3026db closes https://github.com/assimp/assimp/issues/3165: fix gcc build. 2020-05-28 21:02:13 +02:00
FRICOTEAUX 87584eb007 glTF2: fix "file size doesn't match" issue when importing GLB in Blender 2020-05-28 11:05:38 +02:00
Yingying Wang 98767cbb08 pull master 2020-05-27 10:23:28 -07:00
Kim Kulling 1427e67b54
Merge pull request #3219 from thomasbiang/gltf2_sparseAccessor_import
Gltf2 Support Importing sparse accessor
2020-05-26 21:44:56 +02:00
Kim Kulling 2c9cfefe67
Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-26 21:30:51 +02:00
Kim Kulling 03eb08d98e
Merge pull request #3243 from assimp/issue_3183-1
Update utRemoveComponent.cpp
2020-05-25 21:02:00 +02:00
Kim Kulling ee45a18852
Merge branch 'master' into issue_3183-1 2020-05-25 20:50:19 +02:00
Kim Kulling a7e03ddb1c
Merge pull request #3242 from assimp/issue_3183
Remove duplicated code
2020-05-25 20:50:03 +02:00
Kim Kulling c94ed5c7b1
Update utRemoveComponent.cpp
closes https://github.com/assimp/assimp/issues/3183
2020-05-25 20:40:19 +02:00
Kim Kulling 4a2cb779bb
Merge branch 'master' into issue_3183 2020-05-25 20:38:55 +02:00
Kim Kulling 8d98d8a72d
Merge pull request #3241 from assimp/kimkulling-dev
File is duplicated
2020-05-25 20:38:41 +02:00
Kim Kulling c82f8c0b8f
Remove duplicated code
closes https://github.com/assimp/assimp/issues/3183
2020-05-25 20:38:12 +02:00
Kim Kulling e33ed9e7a1
File is duplicated
closes https://github.com/assimp/assimp/issues/3238
2020-05-25 20:30:18 +02:00
Kim Kulling 78c9ac2889
Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-25 16:11:01 +02:00
Kim Kulling a6d554f645
Merge pull request #3233 from kshepherd2013/master
Fixed rotation order bug in BVH Loader
2020-05-21 22:21:58 +02:00
Kim Kulling a97e4c15b3
Merge branch 'master' into master 2020-05-21 21:15:50 +02:00
Kim Kulling 1681850424
Merge pull request #3232 from MalcolmTyrrell/verboseLogging
Verbose logging
2020-05-21 21:12:11 +02:00
Kim Kulling ecfca1d5c5
Merge branch 'master' into verboseLogging 2020-05-21 18:30:52 +02:00
Kim Kulling f940a37be6
Merge pull request #3235 from rmstyrczula/master
Fix double free caused in FindInvalidDataProcess
2020-05-20 10:20:00 +02:00
Yingying Wang 50f0a86798 conditional export 2020-05-19 16:10:41 -07:00
Ryan Styrczula c4055d04b4 Fix double free caused in FindInvalidDataProcess
In debug builds, there's no issues, but in release, an invalid mesh that
is deleted in FindInvalidDataProcess will be double free'd when the
parent scene is destroyed.
2020-05-19 14:38:10 -04:00
Yingying Wang c10e409a5d merge 2020-05-18 12:16:45 -07:00
Yingying Wang 193deb3441 cleanup 2020-05-18 12:01:09 -07:00
Yingying Wang e39c632809 cleanup 2020-05-18 11:50:51 -07:00
Yingying Wang a87df0eb32 merge 2020-05-18 11:35:46 -07:00
Yingying Wang 0897c4c7be merge 2020-05-18 11:31:44 -07:00
Yingying Wang 02cbd36271 pull master 2020-05-18 11:15:18 -07:00
Kevin Shepherd e9a3cc2c8a
Fixed rotation order bug in BVH Loader
This bug has been present since after the 4.10 release.
It fixes the issue "play the bvh error" #2187
Almost all bvh files are affected, such as any of the CMU library.
The bug is caused by the introduction of channelMap in the BVHLoader.cpp - function void BVHLoader::CreateAnimation(aiScene *pScene).  The channelMap loses the rotation order present oin the BVH file, and always applies the rotations in X,Y,Z order.
2020-05-18 16:07:46 +01:00
Malcolm Tyrrell 14692368d5 Same for LogDebug -> LogVerboseDebug 2020-05-18 11:55:14 +01:00
Malcolm Tyrrell df2630d0e8 Change in comment. 2020-05-18 11:45:13 +01:00
Malcolm Tyrrell 87a7662bee More thinks using VERBOSE_DEBUG 2020-05-18 11:45:00 +01:00
Kim Kulling 3b15eca099
Merge pull request #3226 from M4T1A5/gltf2_fix_skin_recursion
[GLTF2] Fix infinite recursion in skin/node parsing
2020-05-18 11:12:49 +02:00
Kim Kulling 2438e1b52e
Merge branch 'master' into gltf2_fix_skin_recursion 2020-05-18 09:05:28 +02:00
Kim Kulling af3033ee8b
Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-17 17:21:55 +02:00
Kim Kulling 110f8845a2
Merge pull request #3215 from kalyan-kumar/unix-cmake-fix
Add IMPORTED_CONFIGURATIONS property to cmake target.
2020-05-17 16:21:42 +02:00
Kim Kulling 1259146daa
Merge branch 'master' into unix-cmake-fix 2020-05-17 14:14:12 +02:00
Kim Kulling 0fc82388f9
Merge pull request #3214 from jercytryn/master
[gltf2 Export] More robust handling for non-finites and 0-length normals
2020-05-17 14:12:48 +02:00
Kim Kulling 4b0a3305b1
Merge branch 'master' into master 2020-05-17 13:54:10 +02:00
Kim Kulling 9566284873
Merge pull request #3229 from assimp/qarmin-added_check_before_using
Qarmin added check before using
2020-05-17 13:53:44 +02:00
Kim Kulling 4f24b3dac2 Merge branch 'added_check_before_using' of https://github.com/qarmin/assimp into qarmin-added_check_before_using 2020-05-17 11:48:24 +02:00
Kim Kulling 15125c5eb8
Merge pull request #3205 from RichardTea/bug-3201-collada_root_meshes
Export Collada Meshes on root aiNode
2020-05-17 11:39:02 +02:00
Kim Kulling cfbdacb02a
Merge branch 'master' into bug-3201-collada_root_meshes 2020-05-16 20:50:34 +02:00
Kim Kulling 883f18ebe5
Merge pull request #3195 from dmgolembiowski/master
Any interest in Rust '18 port?
2020-05-16 20:49:55 +02:00
Kim Kulling d7e8fefed7
Merge branch 'master' into master 2020-05-16 20:41:05 +02:00
Kim Kulling 7fe5257e0f
Merge pull request #3194 from RichardTea/collada_unit_test_cleanup
Collada unit test cleanup
2020-05-16 20:40:28 +02:00
Kim Kulling df9c09d9e1
Merge branch 'master' into collada_unit_test_cleanup 2020-05-16 19:59:30 +02:00
Yingying Wang b8e39b58d1 clean up 2020-05-15 12:32:58 -07:00
Yingying Wang f6720271cb sparce accessor exporter 2020-05-15 12:20:31 -07:00
Malcolm Tyrrell d70685d37f Fix typo 2020-05-15 17:50:48 +01:00
Malcolm Tyrrell 90cdbd9d9a Fix ups 2020-05-15 17:46:50 +01:00