Commit Graph

132 Commits

Author SHA1 Message Date
Kim Kulling
6205af4efb replace NULL and avoid ai_assert with more than 2 tests. 2020-06-23 21:05:42 +02:00
Filip Lundgren
2006286528 Fix Maya PBR & stingray texture detection 2020-06-22 23:14:16 +02:00
Filip Lundgren
ba09e1ef94 Fix Blender .fbx metalness detection 2020-06-21 23:56:11 +02:00
Kim Kulling
b3af5c5a14 closes https://github.com/assimp/assimp/issues/3253 : remove useless code 2020-06-17 20:37:39 +02:00
Kim Kulling
31b8d4710f Merge branch 'master' into issue_3165 2020-06-15 20:32:00 +02:00
Kim Kulling
15f11aec93 Merge branch 'master' into gltf2_targetNames_export 2020-06-14 09:43:09 +02:00
kimkulling
f938a6b744 fix leak: just ignore broken texture coordinates. 2020-06-12 14:52:02 +02:00
kimkulling
1e0c5f26b4 Merge branch 'migenius-migenius-fix-texcoord' of https://github.com/assimp/assimp into migenius-migenius-fix-texcoord 2020-06-12 12:30:11 +02:00
kimkulling
ad62e6e863 fix unittest check - cannot work, just crash shall not occurr any more. 2020-06-12 12:29:51 +02:00
Kim Kulling
f67c71d5c7 Merge branch 'master' into fbx_blendshape_channelName 2020-06-12 10:55:32 +02:00
ywang
e65434bf82 extra callback 2020-06-11 17:37:06 -07:00
ywang
f57e7221c0 temp 2020-06-10 13:23:29 -07:00
Kim Kulling
ffaa634c48 Merge branch 'master' into issue_3165 2020-06-09 10:48:27 +02:00
Kim Kulling
620bebb999 diable warning only for gcc 8.0 or greater 2020-06-09 10:14:57 +02:00
Kim Kulling
42afc40d16 Disable warning only for gcc 8.0 or greater 2020-06-09 10:13:43 +02:00
Kim Kulling
35fb4c9370 Remove dead code 2020-06-09 10:07:25 +02:00
Kim Kulling
5c7bed01f1 remove dead code. 2020-06-09 10:06:50 +02:00
Paul Arden
9e46f9751f Check for invalid texture coordinate accessor. Fixes #3269. 2020-06-09 15:49:38 +10:00
Yingying Wang
8fed101432 avoid all zero 2020-06-08 16:18:11 -07:00
Yingying Wang
f18f1a35f6 accommodate linux build 2020-06-08 14:49:50 -07:00
Yingying Wang
2065512470 remove comments 2020-06-08 14:41:53 -07:00
Yingying Wang
12dc736d94 Merge branch 'master' of https://github.com/thomasbiang/assimp into gltf2_sparseAccessor_export 2020-06-08 14:32:23 -07:00
Yingying Wang
26421aebc9 support channel name in blendshape name 2020-06-08 13:33:16 -07:00
Kim Kulling
b37d42f6b5 Perform sanity check only in debug
closes https://github.com/assimp/assimp/issues/3255
2020-06-07 18:03:47 +02:00
Kim Kulling
e6446e1e68 Merge branch 'master' into issue_3258 2020-06-07 08:23:04 +02:00
Alec
2c0df39ef3 Added rapidjson define to avoid warnings in c++17 2020-06-06 14:33:41 +02:00
Kim Kulling
62273b63e5 closes https://github.com/assimp/assimp/issues/3256: Remove redundand code 2020-06-06 12:22:01 +02:00
Yingying Wang
4e34853ac7 gltf2 export target names for blendshapes 2020-06-05 12:17:27 -07:00
Kim Kulling
6d04e16c7e Merge branch 'master' into issue_3165 2020-05-28 21:51:58 +02:00
kimkulling
d40a3026db closes https://github.com/assimp/assimp/issues/3165: fix gcc build. 2020-05-28 21:02:13 +02:00
Yingying Wang
98767cbb08 pull master 2020-05-27 10:23:28 -07:00
Kim Kulling
78c9ac2889 Merge branch 'master' into gltf2_sparseAccessor_import 2020-05-25 16:11:01 +02:00
Kim Kulling
a97e4c15b3 Merge branch 'master' into master 2020-05-21 21:15:50 +02:00
Kim Kulling
ecfca1d5c5 Merge branch 'master' into verboseLogging 2020-05-21 18:30:52 +02:00
Yingying Wang
50f0a86798 conditional export 2020-05-19 16:10:41 -07: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
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
87a7662bee More thinks using VERBOSE_DEBUG 2020-05-18 11:45:00 +01:00
Kim Kulling
2438e1b52e Merge branch 'master' into gltf2_fix_skin_recursion 2020-05-18 09:05:28 +02:00
Kim Kulling
4b0a3305b1 Merge branch 'master' into master 2020-05-17 13:54:10 +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
cfbdacb02a Merge branch 'master' into bug-3201-collada_root_meshes 2020-05-16 20:50:34 +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