Commit Graph

177 Commits (f1d225c18d2e18bb0613710da17b17a72ede9277)

Author SHA1 Message Date
Ville Voutilainen 6ebae5e67c GCC 11 build fixes 2021-01-24 11:04:46 +02:00
Kim Kulling 11a17ebfe6
Merge branch 'master' into tdb/pbrt3_exporter 2021-01-20 20:03:30 +01:00
Kim Kulling f8dd3a9aa6
Update DefaultIOSystem.cpp 2021-01-20 08:05:43 +01:00
Kim Kulling ed3e745752
Update DefaultIOSystem.cpp 2021-01-19 21:58:04 +01:00
Kim Kulling f05a57560b
Remove buggy method. 2021-01-19 21:27:50 +01:00
Kim Kulling 5b325af79f
Fix typo. 2021-01-19 21:19:42 +01:00
Kim Kulling 5a6498af92
Fix nullptr access 2021-01-19 21:14:38 +01:00
Matt Pharr 8f5148f108
Merge branch 'master' into tdb/pbrt3_exporter 2021-01-18 17:15:40 -08:00
Dan Church 0bc5cf9fd3
Fix build failure on Linux 2021-01-18 16:17:28 -06:00
Kim Kulling f24c042925
Fix typo 2021-01-18 20:28:38 +01:00
Kim Kulling 0803e5e6f3
Fix nullptr dereference in scenepreprocessor 2021-01-18 20:25:33 +01:00
Matt Pharr 1042845414 Merge branch 'master' of https://github.com/assimp/assimp into tdb/pbrt3_exporter 2021-01-11 19:57:10 -08:00
Matt Pharr 71cfd8e0cf Merge branch 'master' into tdb/pbrt3_exporter 2021-01-11 19:54:11 -08:00
Matt Pharr 938537c884 Checkpoint improvements to pbrt exporter 2021-01-08 16:57:22 -08:00
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
wasd845 4e9176d2cd
_dest may be destructed twice if _dest is not null in MergeScenes() 2020-12-14 19:16:29 +08:00
Biswapriyo Nath e2af015a57 Common: Fix GCC error invalid conversion in MINGW. 2020-12-11 21:43:09 +05:30
Kim Kulling c7aeb882e6
Update ScenePreprocessor.cpp 2020-12-03 17:28:51 +01:00
Neil Clifford ea60563822
Merge branch 'master' into scenepreprocessor-memoryleak 2020-11-26 08:57:57 +00:00
Neil Clifford fc842a0f97 Sceneprecessor potential memory leak 2020-11-19 13:20:43 +00:00
Inho Lee 8845d7eed3 Prevent to generate redundant morph targets for glTF2 2020-11-11 20:49:22 +01:00
Kim Kulling 72bc41b50f
Merge branch 'master' into fix/xcode-compile-20201018 2020-10-28 22:00:08 +01:00
Kim Kulling 57e691e28e openddl: latest greatest. 2020-10-25 10:34:43 +01:00
Kim Kulling 6ee5e248ee
Fix typo 2020-10-22 22:26:29 +02:00
john d48ac9d0a4 fix xcode compile bug 2020-10-18 10:54:04 +08:00
Kim Kulling 857f62cde0 closes pParam.mReference = source; 2020-10-14 20:34:46 +02:00
Kim Kulling d6892b3f58 Merge branch 'master' into pugi_xml 2020-09-25 21:00:09 +02:00
Kim Kulling 0e9621012c
Adapt code style - finally :-). 2020-09-14 08:43:31 +02:00
Kim Kulling 1ff9e2b522
Adapt code style. 2020-09-14 08:40:21 +02:00
Kim Kulling 23defc275a
Merge branch 'master' into makeInternalErrorsAccessible 2020-09-14 08:36:13 +02:00
Denis Blank f3b25b999b Fix an unreferenced formal parameter warning on MSVC when no exporter is built 2020-09-05 23:20:31 +02:00
kimkulling 0730eebe6f fix collada handling of xml nodes. 2020-08-28 16:17:56 +02:00
Malcolm Tyrrell 8f893e3653 Actually, just keep the old behaviour for now. 2020-08-20 14:32:15 +01:00
Malcolm Tyrrell 9b5e758bdd Even simpler DeadlyErrorBase 2020-08-19 17:59:13 +01:00
Malcolm Tyrrell 6f9c61e157 Use case which matches surrounding code. 2020-08-19 17:57:25 +01:00
Malcolm Tyrrell e1a0163e7e Make all exceptions available. 2020-08-18 18:14:51 +01:00
Malcolm Tyrrell 0ffcdf160e Build formatting into DeadlyImportError 2020-08-18 16:32:34 +01:00
Malcolm Tyrrell 829ff1adf0 Maybe this will help. 2020-08-18 10:33:47 +01:00
Malcolm Tyrrell b1ed751b83 Provide an API for accessing internal errors. 2020-08-18 10:33:42 +01:00
Kim Kulling 729882debb
Fix incorrect index
closes https://github.com/assimp/assimp/issues/3364
2020-08-11 19:57:36 +02:00
kimkulling 13d7fad7f7 closes https://github.com/assimp/assimp/issues/2992: add single or double precision + missing compilers. 2020-08-07 14:23:07 +02:00
Kim Kulling e7ae576614
undo change 2020-08-03 15:54:19 +02:00
Kim Kulling 435bba30dd
Move functions into the correct preprocessor branch 2020-08-03 09:30:02 +02:00
RichardTea 9cad10a995 Disable MSVC warnings on all MSVC
Fixes the build on MSVC 2017 (and probably MSVC 2015)
2020-07-17 14:58:51 +01:00
Kim Kulling fa486240d5
Merge branch 'master' into rbsheth_update_hunter 2020-07-17 11:39:55 +02:00
Kim Kulling 516bdc2a4b
Merge branch 'master' into master 2020-07-16 22:48:02 +02:00
Kim Kulling df8792d24b
Merge branch 'master' into gltf1_gltf2_split 2020-07-16 10:45:55 +02:00