Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,821 Commits 19 Branches 43 Tags
bed2cf1a23d485c4c92940899058a00a7dafbe3e
Commit Graph
6309 Commits
Author SHA1 Message Date
Kim Kulling 5d091c4591 Merge branch 'master' into kimmi_dev 2018-09-26 19:15:58 +02:00
ardenpm 586c812eee Merge pull request #5 from assimp/master 
Merge commits from head master.
 2018-09-26 15:44:41 +10:00
Kim Kulling 07362fdd35 Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev 2018-09-25 20:16:28 +02:00
Kim Kulling 6146ff818c Enable coveralls for export tests. 2018-09-25 20:15:48 +02:00
Alexandre Avenel 504e5fd5c5 Use unique_ptr for gltf2 textures 2018-09-24 21:28:53 +02:00
Kim Kulling 72aa49c54f Merge branch 'master' into kimmi_dev 2018-09-22 15:52:22 +02:00
Kim Kulling 9f6238f3af INtroduce unittests. 2018-09-22 15:50:40 +02:00
Kim Kulling 56392cc02f Update MMDPmxParser.cpp 
Fix encoding for readstrings.
 2018-09-22 12:50:23 +02:00
Kim Kulling d42f9a3226 Update MMDImporter.cpp 
Reformattings
 2018-09-22 12:46:38 +02:00
Kim Kulling 02c4b7f1bc Merge branch 'master' into umw_dev 2018-09-22 10:24:09 +02:00
Kim Kulling cc0b3e1249 Merge branch 'master' into fix_gltf2_export_componentType_error 2018-09-22 07:54:10 +02:00
Kim Kulling 24b42274fb Update MDCFileData.h 
Fix build by remove not supported initializer for array.
 2018-09-21 20:13:35 +02:00
Kim Kulling 3a38c2c067 Update MDLFileData.h 
Remove not supported array initialization.
 2018-09-21 19:43:19 +02:00
Kim Kulling e129d88825 Update ASEParser.h 
Fix not supported array initialization.
 2018-09-21 19:26:41 +02:00
Kim Kulling 2017e50e7b Update AMFImporter_Node.hpp 
Fix invalid array initialization.
 2018-09-21 18:59:47 +02:00
kimkulling f75bf6d99c MAke noexcept compiler-specific. 2018-09-21 16:25:27 +02:00
kimkulling f818a909e5 Fix static-code-analysis findings. 2018-09-21 16:07:09 +02:00
arkeon7 6cea62142c Merge branch 'master' into Manage_PCloud_in_Filters 2018-09-20 10:34:55 +02:00
Arkeon 9eeaf19eab Allow findDegenerate and SplitLargeMesh to pass point clouds models. 
Otherwise the model is removed or crash
 2018-09-20 10:31:32 +02:00
Kim Kulling 29496d877e Merge branch 'master' into master 2018-09-17 19:58:11 +02:00
Kim Kulling 6ee9b07c49 closes https://github.com/assimp/assimp/issues/212: introduce unittest for line-splitter, will validate that the current behaviour is correct. 2018-09-16 17:13:34 +02:00
Kim Kulling 4e357d1ff4 Merge branch 'master' into master 2018-09-13 20:04:41 +02:00
Paul Arden 7911faf130 Fixed problem getting glTF 2.0 camera type, fixes #2138. 2018-09-13 16:04:04 +10:00
Kim Kulling 4f7bacd108 Collada: some reformatting + minor findings. 2018-09-11 20:01:16 +02:00
FRICOTEAUX d5de32ec1c FBX import: fix import of direct data by vertices + unify node renaming 2018-09-11 16:07:43 +02:00
Kim Kulling c1ed5e0048 Merge branch 'master' into assbin_test 2018-09-11 11:14:50 +02:00
Kim Kulling afd47d5ab6 Update AssbinLoader.cpp 
Fix memory leak,
 2018-09-11 09:12:28 +02:00
Kim Kulling 081365df48 Introduce simple export test for assbin. 2018-09-10 22:42:24 +02:00
Turo Lamminen c3d8464a37 Remove aiCreateAndRegisterDefaultMaterial, it's completely wrong 2018-09-10 16:41:12 +03:00
Kim Kulling c25a2dfc22 Assbin: add unittest. 2018-09-08 19:15:56 +02:00
Kim Kulling 1c577f66f7 Collada-Exporter: fix some minor findings. 2018-09-07 19:14:52 +02:00
Daniel Löber 2ee09b2528 Correct 3MF displaycolor import 2018-09-05 16:23:47 +02:00
Joe Schutte 640698ba57 Fix compile error that clang caught. 2018-09-03 13:22:46 -07:00
Kim Kulling d3f1f2337d Merge master 2018-09-03 21:59:08 +02:00
Kim Kulling b191754863 Merge branch 'master' into step-import 2018-09-03 21:59:00 +02:00
Joe Schutte 78fe5e7f04 Fix expensive memory allocation and memory copying occurring in obj files with a large number of meshes. 2018-09-03 11:33:56 -07:00
Kim Kulling 499f66f3cc Step: check step-files for import. 2018-09-02 13:04:52 +02:00
Kim Kulling a7306abcfe MDC-Loader: fix a possible nullptr access. 2018-08-31 19:29:17 +02:00
Kim Kulling dcfc505c4c Merge branch 'master' into issue_1451 2018-08-28 19:44:46 +02:00
Kim Kulling aa8e32c509 closes https://github.com/assimp/assimp/issues/1451: break when assimp-bin format was exported with a different version. 2018-08-28 19:42:20 +02:00
Kim Kulling c75bc99902 Step-Importer: introduce new files. 2018-08-26 19:05:21 +02:00
Kim Kulling 09cf839188 Merge branch 'master' into master 2018-08-19 13:17:27 +02:00
gstanlo 74e8200a49 Merge branch 'master' into master 2018-08-17 14:12:15 -07:00
gstanlo 82f3d40d60 Fixes crash when importing invalid glTF/2.0 files 
Skips some glTF/2.0 uv processing if the count of uvs in the attribute stream doesn't match the vertex count.

This happens with some malformed glTF/2.0 files, and the change will allow them to be processed properly.
Without the change, an access violation will occur several lines below if uv count is less than the position count.
 2018-08-17 13:49:01 -07:00
Kim Kulling a16fb1e54c Merge branch 'master' into master 2018-08-17 21:46:08 +02:00
Mike Feldstein 0ba57202f7 Use array delete command vs object delete since mMeshes is allocated with new[] 2018-08-16 13:56:35 -07:00
Kim Kulling f4e6d4bb9e Merge branch 'master' into master 2018-08-16 19:02:20 +02:00
Jeka Vlasov 102486005d Fix memory leak on throw 2018-08-15 03:40:39 +03:00
Jeka Vlasov 2b15586e6b Replace memcpy_s with memcpy to fix build with gcc 4.8 2018-08-15 01:22:28 +03:00
Jeka Vlasov d25083dba9 Add point cloud support for OBJ importer 2018-08-13 00:18:12 +03:00