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
54be7ac582
Update unzip contrib
2020-12-24 01:53:40 +01:00
Kim Kulling
b4b011e764
Merge branch 'master' into master
2020-12-22 11:11:45 +01:00
Kim Kulling
50f9fb28b6
Merge branch 'master' into fix-casting-mingw
2020-12-21 18:29:18 +01:00
Kim Kulling
981923821a
Merge branch 'master' into gltf2-exporter-crash
2020-12-18 16:27:06 +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
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
a2adef8726
Merge branch 'master' into add-msvc-check
2020-12-11 14:11:10 +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
Kim Kulling
e4a1fb171e
Merge branch 'master' into master
2020-12-09 17:58:18 +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
c0d7ea981a
Merge branch 'master' into gltf_fixes
2020-12-04 16:02:16 +01:00
Kim Kulling
eccdc6dc96
Merge branch 'master' into master
2020-12-04 15:30:56 +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
Kim Kulling
f67a9f253f
Merge branch 'master' into 3dsMax2021PbrMaterials
2020-12-03 22:20:01 +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
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
Biswapriyo Nath
8d8ba521e2
Check _MSC_VER for MSVC specific pragma directives.
...
This fixes build issues when compiled with compiles like Clang or GCC.
2020-12-02 02:05:14 +05:30
Malcolm Tyrrell
f7be3048de
New 3ds Max PBR Materials in FBX
2020-12-01 12:05:42 +00:00
FRICOTEAUX
b47c5c8c27
glTF2Exporter: fix crash when exporting a scene with several meshes per node (regression coming from commit e8d2b84
on 08/03/2020 "clean all warnings for vs-2019")
2020-11-30 20:11:41 +01:00
Max Vollmer
53ff0702ce
Fixed check for base64 char values
2020-11-30 16:21:29 +00:00
Max Vollmer
7d72c78c8e
Some improvements
2020-11-30 15:20:51 +00:00
Max Vollmer
6ed1488e6e
* Improved error messages
...
* Throw instead of asserts on invalid file input
2020-11-30 15:04:06 +00:00
Oleg Bogdanov
4d4a3c42f6
Fix for 3489 | Preserve morph targets when splitting by bone count
2020-11-28 10:01:50 -08:00
Kim Kulling
88be8ec698
Merge branch 'master' into fbxExceptionSafety
2020-11-27 21:49:58 +01:00
Malcolm Tyrrell
149b8d1fd1
Don't need operator< either.
2020-11-27 14:26:51 +00:00
Malcolm Tyrrell
14f79caf41
textures_converted keys can just be pointers
2020-11-26 16:29:37 +00:00
Neil Clifford
ea60563822
Merge branch 'master' into scenepreprocessor-memoryleak
2020-11-26 08:57:57 +00:00
Kim Kulling
4590f06756
Merge branch 'master' into master
2020-11-25 16:57:49 +01:00
Kim Kulling
c059e58c5e
Merge branch 'master' into fbxparser-overead
2020-11-24 08:36:15 +01:00
Kim Kulling
fe78310486
Merge branch 'master' into fbxExceptionSafety
2020-11-23 10:08:23 +01:00
Evangel
98e42e22b8
Added check around setting pScene->mName from asset.scene.
2020-11-22 15:49:41 +10:00
Evangel
30584c1ec1
Replaced name with scene_name to avoid shadowing.
2020-11-22 15:36:08 +10:00
Evangel
67abcb10ba
Added mName to aiScene. Primarily to provide access to the "name" member of glTF2 scenes.
2020-11-22 15:33:31 +10:00
Malcolm Tyrrell
885a196c74
Unsigned
2020-11-19 16:30:44 +00:00
Kim Kulling
8108338215
Merge branch 'master' into master
2020-11-19 16:34:15 +01:00
Neil Clifford
fc842a0f97
Sceneprecessor potential memory leak
2020-11-19 13:20:43 +00:00
Neil Clifford
7b59cc297e
FBXParser.cpp - handle buffer over-read cases correctly
2020-11-19 12:20:06 +00:00