Commit Graph

6885 Commits (df6d2576335777055ba749aec8fddc7894a4320d)

Author SHA1 Message Date
Turo Lamminen b20ab96a43 Fix blend test files 2018-09-13 13:44:31 +03:00
Paul Arden 7911faf130 Fixed problem getting glTF 2.0 camera type, fixes #2138. 2018-09-13 16:04:04 +10:00
ardenpm 32a85a972a
Merge pull request #4 from assimp/master
Merge upstream changes.
2018-09-13 15:55:16 +10:00
Kim Kulling 0066f3dafe
Merge pull request #2128 from assimp/assbin_test
Assbin: add unittest.
2018-09-12 21:55:47 +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 ab5c100fd4
Update utAssbinImportExport.cpp
Fix unittests when no export is configured.
2018-09-11 09:43:38 +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
Kim Kulling 07a8bac415
Merge pull request #2132 from turol/remove_default_material
Remove aiCreateAndRegisterDefaultMaterial
2018-09-10 20:26:26 +02:00
Turo Lamminen 4ff52c98bb Add unit test for two independent importers loading STL models 2018-09-10 16:43:27 +03: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 a7c13eef2c
Merge pull request #2122 from loebl/bug/wrong-color-import-in-3mf
Correct 3MF displaycolor import
2018-09-05 17:04:02 +02:00
Daniel Löber 2ee09b2528 Correct 3MF displaycolor import 2018-09-05 16:23:47 +02:00
Kim Kulling ffda754d97
Merge pull request #2117 from schuttejoe/master
Fix expensive memory allocation and memory copying occurring in obj…
2018-09-04 18:00:11 +02:00
Kim Kulling 78a70baf7c Step-Importer: introduce data generation based on config. 2018-09-03 22:28:54 +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 c5eb39cb7b
Merge pull request #2114 from wmatyjewicz/pyassimp-metadata-access
Native Python interface for accessing metadata in PyAssimp
2018-09-02 23:15:57 +02:00
Kim Kulling 2c012f7079
Merge branch 'master' into pyassimp-metadata-access 2018-09-02 14:22:06 +02:00
Kim Kulling 394a15d989
Merge pull request #2116 from assimp/pointclout_test
Obj-Import: add missing unittest for poiuntcloud support.
2018-09-02 14:04:48 +02:00
Kim Kulling 543afdc4e2 Obj-Import: add missing unittest for poiuntcloud support. 2018-09-02 13:19:52 +02:00
Kim Kulling 499f66f3cc Step: check step-files for import. 2018-09-02 13:04:52 +02:00
Kim Kulling f38b7b5584
Merge branch 'master' into pyassimp-metadata-access 2018-09-02 12:02:51 +02:00
Kim Kulling 15a02551d1
Merge pull request #2112 from assimp/fix-nullptr-access
MDC-Loader: fix a possible nullptr access.
2018-09-02 11:37:57 +02:00
Kim Kulling 417c1f418b
Merge branch 'master' into fix-nullptr-access 2018-09-02 10:51:37 +02:00
Kim Kulling 008455b984 MDC: introduce model to test MDC-format. 2018-09-02 10:38:21 +02:00
Wojciech Matyjewicz fdf52f3d25 Build Python representation for metadata. 2018-09-02 00:52:24 +02:00
Wojciech Matyjewicz 8bbfac1f04 Factor out Assimp string -> Python string conversion code. 2018-09-02 00:51:14 +02:00
Kim Kulling 1550314b14
Merge pull request #2113 from assimp/Step-Reorganization
Step: introduce Application-Protocol schema for stepfiles.
2018-09-01 20:35:57 +02:00
Kim Kulling e174326ae9 MDC: Fix unittest build. 2018-09-01 18:07:04 +02:00
Kim Kulling 0fb901b42a STep: introduce Application-Protocol schema for stepfiles. 2018-09-01 18:06:16 +02:00
Wojciech Matyjewicz 475ed6fdc3 Fix metadata property type declarations. 2018-09-01 10:15:09 +02:00
Wojciech Matyjewicz 7004066532 Fix inconsistent newlines.
LF newlines have been changed to CR LF to match the rest of the file.
2018-09-01 10:11:59 +02:00
Kim Kulling f206c5ebf0 MDC: prepare a unittest. 2018-08-31 21:46:12 +02:00
Kim Kulling a7306abcfe MDC-Loader: fix a possible nullptr access. 2018-08-31 19:29:17 +02:00
Kim Kulling a872e7d908
Merge pull request #2105 from assimp/issue_1451
closes https://github.com/assimp/assimp/issues/1451: break when assim…
2018-08-29 17:22:34 +02:00
Brendan Hack 8518a5cda4
Merge pull request #3 from migenius/master
merge master to RS build branch
2018-08-29 09:31:51 +10:00
Brendan Hack 9e1001120d
Merge pull request #2 from assimp/master
merge upstream changes
2018-08-29 09:09:03 +10:00
Kim Kulling b4860aef20
Merge branch 'master' into issue_1451 2018-08-28 23:16:31 +02:00
Kim Kulling 324d89b76d
Merge pull request #2108 from assimp/kimkulling-patch-2
Update Readme.md
2018-08-28 23:16:03 +02:00
Kim Kulling 992ca11c47
Merge pull request #2107 from assimp/kimkulling-md-doc
Update Readme.md
2018-08-28 19:56:25 +02:00
Kim Kulling 372c1e6175
Update Readme.md
Add a link to the Model-database.
2018-08-28 19:46:43 +02:00
Kim Kulling 079886330d
Update Readme.md
Add a link to the Model-database.
2018-08-28 19:46:19 +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