Commit Graph

5356 Commits

Author SHA1 Message Date
Krishty
55dd5faafb fixed export exceptions on import
Ogre and 3MF imports threw DeadlyExportErrors under some circumstances. Bad for people who assumed that they only needed to catch DeadlyImportErrors. Changed them to DeadlyImportErrors.
2021-04-19 19:33:41 +02:00
Kim Kulling
21b56b0058 Merge branch 'master' into tr1 2021-04-14 12:46:59 +02:00
Kim Kulling
0b61a8875a Merge branch 'master' into patch-1 2021-04-14 10:22:42 +02:00
Hill Ma
4aa52b3af8 Flip the check on _MSC_VER for using TR1 containers. 2021-04-13 11:15:52 -07:00
Kim Kulling
263d450300 Merge branch 'master' into master 2021-04-12 09:35:03 +02:00
Kim Kulling
a3ee377af7 Merge branch 'master' into ms3d-fixes 2021-04-11 19:12:06 +02:00
Kim Kulling
cf4ef04a80 Merge branch 'master' into master 2021-04-07 20:58:40 +02:00
Clement JACOB
e66232d8c3 Merge branch 'master' into feature/gltf_fb_ngon_encoding 2021-04-07 13:54:31 +02:00
Patrick Walton
a44ba41413 Fix incorrect indices in the MilkShape 3D loader 2021-04-05 19:14:48 -07:00
Kim Kulling
7fee914776 Fix direct leak
closes https://github.com/assimp/assimp/issues/3747
2021-04-05 21:24:54 +02:00
Garux
437d7bf8b8 Fix MDC loader
placement new was clearing input buffer by constructor, which was nothing to do with adequate parsing
changes are not analyzed in depth, but at least test model and models of Wolf:ET are loading and not crashing
2021-04-05 16:39:41 +03:00
Kim Kulling
22413d85ad Merge branch 'master' into MalcolmTyrrell/tangentCheck 2021-04-03 17:42:44 +02:00
Kim Kulling
80fc8538be Update AMFImporter_Material.cpp 2021-04-03 10:29:16 +02:00
Kim Kulling
d62c89557b Remove dead code 2021-04-03 10:28:19 +02:00
Kim Kulling
46e49d0b83 Update AMFImporter_Geometry.cpp 2021-04-03 10:27:54 +02:00
Kim Kulling
cdb6a62cdb Merge branch 'master' into issue_3678 2021-04-03 10:27:07 +02:00
Kim Kulling
da0543972b Fix parsing for AMF-Files. 2021-04-03 10:25:03 +02:00
Kim Kulling
89a8f87dae AMF: Remove unused macros 2021-04-02 13:10:24 +02:00
Clement Jacob
fc2c12ad6a Fixing encoding when lines and points are encountered 2021-03-30 09:58:28 +02:00
Clement Jacob
fc0cf2ea8d NGON encoding triangles only 2021-03-30 09:19:50 +02:00
Clement Jacob
2e90fed527 Refactoring and fixing remaining issues in triangulation process 2021-03-30 09:10:50 +02:00
Clement Jacob
596001c89c Refactoring the extension 2021-03-30 09:10:50 +02:00
Clement Jacob
81019d5e58 Fixing quad encoding 2021-03-30 09:10:50 +02:00
Clement Jacob
6d1a0c6054 Adding quad proper handling 2021-03-30 09:10:50 +02:00
Clement Jacob
8e589221d7 [gltf2-exporter] Adding FB_ngon_encoding support 2021-03-30 09:10:50 +02:00
Kim Kulling
f61a41bdd9 Merge branch 'master' into fbxBlendshapes 2021-03-29 21:48:51 +02:00
Bernold Kraft
09d3266250 Fixing 3DS import for CHUNK_TRMATRIX translation vector. 2021-03-29 15:31:08 +02:00
urschanselmann
5755530bab Merge branch 'master' into master 2021-03-28 17:40:17 +02:00
Kim Kulling
e5862c18be Merge branch 'master' into fbxBlendshapes 2021-03-28 13:02:35 +02:00
Bernold Kraft
348c34811f Fixing CHUNK_TRMATRIX translation sub chunk
and therefore omitting the transform aggregation in the CHUNK_VERTLIST.
2021-03-26 22:21:45 +01:00
Gordon Chapman
3fd865b4bf Added Blendshape Support to FBX Export 2021-03-24 18:10:03 -07:00
Malcolm Tyrrell
d94ddd32b1 Extra check. Better logging. 2021-03-24 11:04:39 +00:00
Malcolm Tyrrell
add165c4a1 Check target sizes to avoid reading beyond allocation 2021-03-24 10:55:40 +00:00
urschanselmann
0a1efe5d58 Merge branch 'master' into master 2021-03-21 17:19:43 +01:00
urschanselmann
86c05a1154 Merge branch 'master' into master 2021-03-19 18:15:15 +01:00
Kim Kulling
5f652feb75 Merge branch 'master' into MalcolmTyrrell/gltfCrashes 2021-03-19 13:35:13 +01:00
Hill Ma
3e99385f44 Fix a memory leak in glTF2.
The destructor of LazyDict uses `delete` but `delete` was not used for objects removed by LazyDict::Remove.
2021-03-17 15:12:54 -07:00
Urs Hanselmann
d9cd07f0d9 Merge branch 'master' of https://github.com/assimp/assimp 2021-03-17 18:26:11 +01:00
Malcolm Tyrrell
3503252e12 Strict check for accessor "count" 2021-03-16 11:47:19 +00:00
Malcolm Tyrrell
e4983aa16e Fix code issue 2021-03-15 16:46:41 +00:00
Malcolm Tyrrell
57652a9084 Version is strictly a string 2021-03-15 16:27:50 +00:00
Malcolm Tyrrell
053c0f5e0a Catch type errors in gltf and try to print out useful context. 2021-03-15 13:06:11 +00:00
Kim Kulling
f5ed217409 Merge branch 'master' into msvc2019fix 2021-03-12 15:49:41 +01:00
Kim Kulling
84cd1d95c7 Merge branch 'master' into FixClangCL 2021-03-12 15:26:49 +01:00
Urs Hanselmann
c0c7e6a0de trim uvIndices to fix import of Cheetah3D generated fbx files 2021-03-12 14:48:38 +01:00
Urs Hanselmann
cc7e229c3c disable size check 2021-03-12 08:55:11 +01:00
Kim Kulling
51ad88afb6 Merge branch 'master' into master 2021-03-10 20:35:37 +01:00
Kim Kulling
806b12dc8b Merge branch 'master' into issue_3678 2021-03-10 19:51:04 +01:00
Kim Kulling
732e9386aa Merge branch 'master' into master 2021-03-10 11:49:13 +01:00
Kim Kulling
6c89631581 closes https://github.com/assimp/assimp/issues/3678: ensure lowercase 2021-03-09 21:08:28 +01:00