Jean-Louis
effe52368c
No need to allocate a full size buffer for small files
2020-12-24 12:18:07 +01:00
Jean-Louis
895137c7d7
Fix unzip max buffer length error
2020-12-24 11:39:59 +01:00
Jean-Louis
c464d01778
Fix fopen64, ftello64, fseeko64 declarations on all platforms
2020-12-24 03:18:09 +01:00
Jean-Louis
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
Kim Kulling
102d380711
Merge pull request #3540 from wasd845/master
...
_dest may be destructed twice if _dest is not null in MergeScenes()
2020-12-22 12:07:01 +01:00
Kim Kulling
b4b011e764
Merge branch 'master' into master
2020-12-22 11:11:45 +01:00
Kim Kulling
ed2b680f46
Merge pull request #3533 from Biswa96/fix-casting-mingw
...
Common: Fix GCC error invalid conversion in MINGW.
2020-12-21 20:04:27 +01:00
Kim Kulling
50f9fb28b6
Merge branch 'master' into fix-casting-mingw
2020-12-21 18:29:18 +01:00
Kim Kulling
5f5f1cf7a0
Merge pull request #3531 from JLouis-B/gltf2-exporter-crash
...
Fixed a crash of the Gltf 2 exporter in the case of an animation without scale animation key.
2020-12-20 21:57:44 +01:00
Kim Kulling
981923821a
Merge branch 'master' into gltf2-exporter-crash
2020-12-18 16:27:06 +01:00
Kim Kulling
b3e1ee3ca0
Merge pull request #3524 from inhosens/master
...
FBXConverter : Fix timescales of FBX animations
2020-12-16 22:33:16 +01:00
Inho Lee
4e5b25cd81
Keep AnimMesh data during the SortByPTypeProcess
...
A Postprocessing step, SortByPTypeProcess, can rebuild Mesh data,
but it does not handle AnimMesh.
This patch helps to rebuild appropriate AnimMeshes for the Mesh.
2020-12-16 19:19:30 +01:00
Inho Lee
b8bf1eac04
FBXConverter : Fix timescales of FBX animations
...
FBX animations were recorded by framenumber, not by time.
This patch will change it as a base of milliseconds.
2020-12-16 15:02:46 +01:00
Kim Kulling
2f1ff974fd
Merge pull request #3519 from MalcolmTyrrell/3dsMax2021PbrMaterials
...
3ds Max 2021 PBR Materials in FBX
2020-12-14 17:11:47 +01:00
wasd845
4e9176d2cd
_dest may be destructed twice if _dest is not null in MergeScenes()
2020-12-14 19:16:29 +08:00
Jean-Louis Boudrand
922f874e78
Merge branch 'gltf2-exporter-crash' of https://github.com/JLouis-B/assimp into gltf2-exporter-crash
2020-12-13 17:03:09 +01:00
Jean-Louis Boudrand
d18fce3f06
Fix https://github.com/assimp/assimp/issues/3054
...
Corrected the animation of each bone of an animation were exported in different animations (+tabs fixes)
2020-12-13 17:02:50 +01:00
Jean-Louis Boudrand
33e7e2366c
Merge branch 'master' into gltf2-exporter-crash
2020-12-13 16:48:40 +01:00
Biswapriyo Nath
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
Biswapriyo Nath
e2af015a57
Common: Fix GCC error invalid conversion in MINGW.
2020-12-11 21:43:09 +05:30
Kim Kulling
7dd0596010
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-11 14:31:00 +01:00
Kim Kulling
3d49d06bcc
Merge pull request #3518 from Biswa96/add-msvc-check
...
Check _MSC_VER for MSVC specific pragma directives.
2020-12-11 14:30:25 +01:00
Kim Kulling
a2adef8726
Merge branch 'master' into add-msvc-check
2020-12-11 14:11:10 +01:00
Kim Kulling
80bb8ab726
Merge pull request #3521 from huiji12321/master
...
Additional Compiler Options for mips64el
2020-12-11 14:07:49 +01:00
Jean-Louis Boudrand
8701a86c9d
Fixed a crash of the Gltf 2 exporter in the case of an animation without a translation, rotation or scale animation key.
2020-12-10 23:47:54 +01:00
huiji12321
db475e7d4a
Merge branch 'master' into master
2020-12-10 09:04:24 +08:00
Kim Kulling
10092cd1ec
Merge pull request #3515 from LoicFr/master
...
glTF2Exporter: fix crash when exporting a scene with several meshes p…
2020-12-09 21:14:51 +01:00
Kim Kulling
e4a1fb171e
Merge branch 'master' into master
2020-12-09 17:58:18 +01:00
Kim Kulling
c168c4689e
Merge branch 'master' into master
2020-12-09 13:59:27 +01:00
Kim Kulling
99e4a10dc3
Merge pull request #3528 from tellypresence/issue-3525_use_option_for_rapidjson_no_member_iterator
...
Provide option for rapidjson no-member-iterator define
2020-12-09 13:58:52 +01:00
tellypresence
6db5b7046f
Provide option for rapidjson no-member-iterator define
...
Originally added to fix warning on MSVC but breaks android build
2020-12-09 20:21:43 +09:00
Kim Kulling
816bbc852c
Merge branch 'master' into master
2020-12-08 19:54:04 +01:00
Kim Kulling
aee01e8345
Merge pull request #3514 from ms-maxvollmer/gltf_fixes
...
GLTF: Fix crash on invalid base64 data + improved error messages
2020-12-08 19:48:53 +01:00
Kim Kulling
233d834514
Merge branch 'master' into gltf_fixes
2020-12-07 20:36:53 +01:00
Kim Kulling
41904ad7ce
Merge pull request #3516 from assimp/kimkulling-patch-8
...
Update Readme.md
2020-12-07 20:30:21 +01:00
Kim Kulling
1f8c75c871
Merge branch 'master' into kimkulling-patch-8
2020-12-07 16:55:07 +01:00
Kim Kulling
c0d7ea981a
Merge branch 'master' into gltf_fixes
2020-12-04 16:02:16 +01:00
Kim Kulling
63f1b66224
Merge pull request #3512 from boguscoder/master
...
Fix for 3489 | Preserve morph targets when splitting by bone count
2020-12-04 15:58:22 +01:00
Kim Kulling
eccdc6dc96
Merge branch 'master' into master
2020-12-04 15:30:56 +01:00
Kim Kulling
f87ab4b4d7
Merge pull request #3506 from MalcolmTyrrell/fbxExceptionSafety
...
Fbx exception safety
2020-12-04 15:30:27 +01:00
Kim Kulling
5020a0aa33
Merge branch 'master' into fbxExceptionSafety
2020-12-04 11:01:56 +01:00
Max Vollmer (Microsoft Havok)
e737adde50
Merge branch 'master' into gltf_fixes
2020-12-04 08:58:52 +00:00
huiji12321
1910bbbdd9
Additional Compiler Options for mips64el
2020-12-04 16:47:43 +08:00
Kim Kulling
f67a9f253f
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-03 22:20:01 +01:00
Kim Kulling
00b626c3c5
Merge pull request #3505 from Neil-Clifford-FB/scenepreprocessor-memoryleak
...
Sceneprecessor - potential memory leak
2020-12-03 20:41:50 +01:00
Kim Kulling
c7aeb882e6
Update ScenePreprocessor.cpp
2020-12-03 17:28:51 +01:00
Malcolm Tyrrell
471d2acc92
Improvements & style
2020-12-03 11:17:45 +00:00
Max Vollmer (Microsoft Havok)
a0ebad1698
Merge branch 'master' into gltf_fixes
2020-12-03 09:28:48 +00:00
Kim Kulling
c5f45e26bd
Merge branch 'master' into scenepreprocessor-memoryleak
2020-12-03 10:08:05 +01:00
Malcolm Tyrrell
19af3f0d31
Swap the meaning using the out_mat property.
2020-12-02 16:59:29 +00:00
