Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
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
Kim Kulling
dd8cf73415 Update BVHLoader.cpp 
Fix compiler warning: not handled enum in switch.
 2018-08-11 00:15:22 +02:00
Kim Kulling
b3132bd8c2 FBX: some refactorings. 2018-08-10 01:57:11 +02:00
Kim Kulling
c3d043e761 FBX: some refactorings. 2018-08-09 21:51:53 +02:00
Kim Kulling
43be7abb70 closes https://github.com/assimp/assimp/issues/2088: fix possible out-of-bound access in fbx-lerp operaation. 2018-08-09 20:48:25 +02:00
Gareth Morgan
8fba4ce7cf Support out of order channels 2018-08-08 15:22:10 -07:00
Kim Kulling
77980bf07c Merge branch 'master' into master 2018-08-06 23:46:54 +02:00
Eddie James
5321e1036d Fix .obj displacement texture parsing 
The string for an opacity texture is a substring of the displacement
texture string. Due to the nature of the string comparison in the
material texture parsing, any displacement textures will be incorrectly
assigned as opacity textures. Fix this by simply performing the check
for displacement texture before checking for opacity texture.
 2018-08-04 16:36:04 -05:00
Kim Kulling
824399c5c4 Merge branch 'master' into Fix2077 2018-08-04 17:00:19 +02:00
Alexandre Avenel
3c37fbdc6b Remove try catch(...) on gltf2 importer 
Better to throw exception than hide it ?
 2018-08-04 12:47:37 +02:00
Alexandre Avenel
ae0f82d5b7 Fix #2077 : GLTF segfault using triangle strip 2018-08-04 12:47:37 +02:00
Jesus Fernandez
c2c44a831c Pass parameter by reference 2018-08-03 14:51:01 +02:00
Kim Kulling
a65a7b6c81 Merge branch 'master' into master 2018-08-02 20:26:48 +02:00
Marco Di Benedetto
cb567d9f65 added internal to_string. 2018-08-01 16:38:33 +02:00
FRICOTEAUX
92490eea01 Optimisation of FBX node name uniqueness 2018-07-30 17:27:03 +02:00
Sebastian Matusik
b965e7a6dc FlipUVsProcess should also process AnimMeshes (if any) 2018-07-28 18:18:17 +01:00
Evgeniy
cd061a0957 Merge branch 'master' into stl_format_issue_2064 2018-07-25 18:38:59 +03:00
kimkulling
9a6b07e522 closes https://github.com/assimp/assimp/issues/1724: add default material access to the material API. 2018-07-25 15:11:24 +02:00
Власов Евгений
7d630e98da STLImporter::LoadBinaryFile add one child node to produce same scene structure as in STLImporter::LoadASCIIFile 2018-07-23 16:44:20 +03:00
FRICOTEAUX
a69e95bdc1 Add support of 32-bit indices for the glTF2 export 2018-07-19 11:29:04 +02:00
Kim Kulling
8a3daa1a24 closes https://github.com/assimp/assimp/issues/2056: use correc exception type in MMD-loader. 2018-07-18 20:29:05 +02:00
Kim Kulling
417fed1693 Merge branch 'master' into fbximport-fix-uniquename 2018-07-18 11:43:38 +02:00
Sebastian Matusik
a5f95f993c Merge branch 'master' into feature/join_vertices_processor_kill_unused_vertices 2018-07-15 22:21:04 +02:00
Kim Kulling
bf1683ab7e Merge branch 'master' into fbximport-fix-uniquename 2018-07-15 19:19:33 +02:00
Kim Kulling
7cb467da11 Update FBXConverter.cpp 
Try to trigger travis.
 2018-07-15 14:55:52 +02:00
Kim Kulling
a4533770f4 Merge branch 'master' into issue_2046 2018-07-14 19:25:07 +02:00
Kim Kulling
b069e7d7d0 Merge branch 'master' into feature/glTFv2_blendshapes_support 2018-07-14 17:09:05 +02:00
Kim Kulling
72de09a562 Update FBXConverter.cpp 
Remove dead code.
 2018-07-14 17:08:04 +02:00
Kim Kulling
91b30e7e74 Update FBXConverter.cpp 
simple change to retrigger CI
 2018-07-14 12:10:59 +02:00
Kenneth Perry (thothonegan)
7967f0a33f FBXImporter: Fix GetUniqueName to return names properly 2018-07-13 15:25:04 -05:00
Kim Kulling
309c52b10f Merge branch 'master' into patch-1 2018-07-10 13:07:28 +02:00
Kim Kulling
c58aef4b4b Merge branch 'master' into ios-build-script 2018-07-10 11:28:54 +02:00
Sebastian Matusik
992194b1b9 Removed signed int vs unsigned int comparison in for loops 2018-07-05 15:15:50 +01:00