Commit Graph

7219 Commits (0021c93892bfafbe555fa7b74792060b61fd1006)

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 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
Kim Kulling 5ea4935dc5
Merge pull request #2103 from vjf/pyassimp-update
Pyassimp update
2018-08-26 08:11:17 +02:00
Vincent Fazio ecd24a736c Add missing metadata fields 2018-08-24 12:06:24 +10:00
Vincent Fazio 597628f43a Prevent 'AttributeError' when printing object attributes 2018-08-24 12:03:54 +10:00
Kim Kulling 8ceca4daaf
Merge pull request #2100 from assimp/qt_viewer_new_imagelib
Introduce header-only imagelib to make install of qt-viewer simpler.
2018-08-20 18:44:11 +02:00
Kim Kulling 1d47d49a66
Merge branch 'master' into qt_viewer_new_imagelib 2018-08-19 23:26:01 +02:00
Kim Kulling ce9186b3a4
Merge pull request #2099 from gstanlo/master
Fixes crash when importing invalid glTF/2.0 files
2018-08-19 23:25:32 +02:00
Kim Kulling 0ff4640dcd Remove qt4-support for viewer. 2018-08-19 21:27:08 +02:00
Kim Kulling fe6be58b35 Some cleanups. 2018-08-19 16:51:47 +02:00
Kim Kulling 09cf839188
Merge branch 'master' into master 2018-08-19 13:17:27 +02:00
Kim Kulling 5390ec1cb9
Merge pull request #2095 from msfeldstein/master
Use delete[] instead of delete to clear mMeshes
2018-08-19 13:16:58 +02:00
Kim Kulling 7f227f8250
Merge branch 'master' into qt_viewer_new_imagelib 2018-08-18 12:01:05 +02:00
Kim Kulling 5a23810d82 Introduce header-only imagelib to make install of qt-viewer simpler. 2018-08-18 11:07:12 +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
Kim Kulling 92078bc47c
Merge pull request #2089 from griffin2000/master
Support out of order channels in BVH
2018-08-17 11:28:14 +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