02a5f6b62f
Remove unneeded newline.
2019-02-06 11:15:27 +00:00
f9014d7410
Add tokenization of 'c' type arrays, both compressed and uncompressed.
2019-02-06 11:15:21 +00:00
1e35ea3bc8
Merge branch 'master' into sec_issues
2019-02-06 11:27:53 +01:00
502f59ccbc
Merge pull request #2323 from assimp/fix_ofd
...
remove dead code
2019-02-06 11:27:07 +01:00
6e39c22554
Fix potential security issues.
2019-02-05 22:05:52 +01:00
28622d25bf
Merge branch 'master' into fix_ofd
2019-02-05 21:10:07 +01:00
103fb5d3eb
Merge pull request #2324 from assimp/kimkulling-patch-4
...
Update Readme.md
2019-02-05 21:09:55 +01:00
216008d230
Update Readme.md
...
closes https://github.com/assimp/assimp/issues/2248 : Add lgtm badge.
2019-02-05 20:16:53 +01:00
963c892862
Merge branch 'master' into fix_ofd
2019-02-05 00:36:59 +01:00
afb779e59d
remove dead code
2019-02-05 00:36:07 +01:00
0f8f1449a1
Merge pull request #2322 from assimp/fix_ofd
...
fix openfiledialog in modelviewer.
2019-02-05 00:06:10 +01:00
daad5b4ee9
Merge branch 'master' into fix_ofd
2019-02-04 22:17:38 +01:00
ae15228703
Merge pull request #2319 from muxanick/topic/large_gltf_files_support
...
glTF/glTF2 Buffer grow changes and large files support
2019-02-04 22:17:09 +01:00
f5ef078834
fix openfiledialog in modelviewer.
2019-02-04 22:15:15 +01:00
5ce1cfedfe
warning fix for gcc
2019-02-04 16:15:52 +00:00
971ba308b3
Merged PR 2811682: buffer grow changes and large files support
...
Buffer grow changes:
The exporting of relatevely large data could take a few days, because reallocation of a buffer every time for a few new bytes is overkill. I've introduced standard capacity member for the buffer and growth it by 1.5 times every time. That helps a lot, descrease exporting to a minute (from a few days).
Large file support:
glTF is a json file, all lengths and offsets don't have a type, just numbers, but code was always reading it as uint32, this doesn't work for files bigger than int32 (almost all files we have as an example). So, I've changed it to be reading as size_t. Specification doesn't specify the type for it, so it's not against spec.
2019-02-04 15:16:28 +00:00
6c4fde73e6
Merge pull request #2318 from assimp/issue_2297
...
closes https://github.com/assimp/assimp/issues/2297 : introduce obj-un…
2019-02-03 21:21:35 +01:00
acc8826b02
Merge branch 'master' into issue_2297
2019-02-03 11:34:07 +01:00
996fb4aae7
closes https://github.com/assimp/assimp/issues/2297 : introduce obj-unittest to validate working importer.
2019-02-03 11:32:56 +01:00
ce691d383f
Merge branch 'master' into kimkulling-patch-3
2019-02-02 15:21:31 +01:00
475e51d157
Merge pull request #2316 from assimp/kimkulling-dev
...
Kimkulling dev
2019-02-02 08:25:06 +01:00
d25654c8c4
Merge branch 'master' into kimkulling-dev
2019-02-01 16:08:01 +01:00
2fd10a37ee
Merge pull request #2317 from severin-lemaignan/master
...
[pyassimp] Bumped to 4.1.4
2019-02-01 16:07:47 +01:00
0a0ac06285
Merge branch 'kimkulling-dev' of https://github.com/assimp/assimp into kimkulling-dev
2019-01-31 17:24:29 +01:00
4347ce4311
Some more findings.
2019-01-31 17:24:08 +01:00
1ac86476fe
[pyassimp] Bumped to 4.1.4
...
Main changes:
- Support for metadata fields (Vincent Fazio, Wojciech Matyjewicz)
- added support for aiExportSceneToBlob (Vincent Fazio)
- a few bug fix + code beautification
2019-01-30 22:41:01 +00:00
0801a62ef7
Merge branch 'master' into kimkulling-dev
2019-01-30 16:09:33 +01:00
e878560b4b
Merge pull request #2312 from LoicFr/master
...
Fix glTF2 export with no texture coordinates
2019-01-30 16:09:10 +01:00
de02fb2129
Fix review findings.
2019-01-30 16:07:40 +01:00
a06133ab52
Update copyrights.
2019-01-30 09:41:39 +01:00
65e4dc89c0
Merge branch 'master' into master
2019-01-29 13:28:36 +01:00
5eed99da0a
Merge pull request #2311 from assimp/kimkulling-dev-1
...
Update README.md
2019-01-29 10:35:27 +01:00
38bebaf4d3
Fix glTF2 export with no texture coordinates
2019-01-28 16:02:09 +01:00
6b8514ba93
Merge branch 'master' into kimkulling-dev-1
2019-01-28 14:40:10 +01:00
dc10f24df1
Merge pull request #2310 from assimp/issue_2251
...
Closes https://github.com/assimp/assimp/issues/2251 : introduce AI_CON…
2019-01-28 14:39:48 +01:00
b35331b92a
Update FindInvalidDataProcess.cpp
...
-Fix some review findings.
2019-01-28 10:50:36 +01:00
4c2898c82b
Merge branch 'master' into issue_2251
2019-01-28 10:06:44 +01:00
2432abacc7
Update README.md
...
Update doc.
2019-01-27 21:11:52 +01:00
5d6fc7a557
Closes https://github.com/assimp/assimp/issues/2251 : introduce AI_CONFIG_PP_FID_IGNORE_TEXTURECOORDS to avoid removing textures.
2019-01-27 21:05:58 +01:00
3aa5a61516
Merge branch 'master' into ETC_Inc
2019-01-23 19:53:43 +01:00
6295e4dbc4
Merge pull request #2306 from AdrianAtGoogle/master
...
MemoryIOSystem delegates to existing IOSystem
2019-01-23 19:52:09 +01:00
d602e2e2da
Merge branch 'master' of github.com:AdrianAtGoogle/assimp
2019-01-22 17:23:50 -08:00
b04ed67288
Update MemoryIOWrapper.h
...
Make code more readable.
2019-01-22 17:22:18 -08:00
f8a23e128b
Update MemoryIOWrapper.h
...
Make code more readable.
2019-01-22 20:47:24 +01:00
05ea039846
Merge branch 'master' into ETC_Inc
2019-01-22 20:10:50 +01:00
ad18cd9660
Update MemoryIOWrapper.h
...
Fix leak.
2019-01-22 11:13:26 +01:00
87112eefae
Fill in rest of interface; switch created_stream to a unique_ptr
2019-01-21 14:37:33 -08:00
8191080986
Adapt MemoryIOSystem to delegate unhandled calls to shadowed IO system
2019-01-21 14:14:48 -08:00
40a1c1ed07
Merge pull request #2307 from assimp/disable_step
...
Disable step.
2019-01-20 21:12:37 +01:00
a04b96ef66
Disable step.
2019-01-20 20:29:23 +01:00
Malcolm Tyrrell
Kim Kulling
Kim Kulling
Mike Samsonov
Séverin Lemaignan
LoicFr
FRICOTEAUX
Adrian Perez