Commit Graph

6230 Commits

Author SHA1 Message Date
Tommy
379562055b Fix incorrect NO_GLTF_IMPORTER define name in glTFExporter.h 2017-12-15 23:18:45 +01:00
Alexis Breust
32e5e3a576 Forgot to uncomment isBinary 2017-12-15 15:40:31 +01:00
Kim Kulling
5e63ba9a9d typo. 2017-12-14 18:10:42 +01:00
Kim Kulling
dec3e2ba42 XGLLoader: fix const issue when seeting vec2. 2017-12-14 18:06:28 +01:00
Kim Kulling
bef219a2d9 fix access violation in vector2. 2017-12-14 17:59:23 +01:00
Kim Kulling
245b9b4bb1 fix typo. 2017-12-14 17:52:47 +01:00
Kim Kulling
e0649b6822 fix misalignment in vector2 [] operator, the non-const one. 2017-12-14 17:42:59 +01:00
Alexis Breust
d29173aaa9 Following specification for padding 2017-12-14 17:32:18 +01:00
Kim Kulling
151d71bc69 fix misalignment in vector2 [] operator. 2017-12-14 17:21:17 +01:00
A. Breust
d3876f6e29 Merge branch 'master' into gltf2-exporter-improvements 2017-12-14 17:07:30 +01:00
Kim Kulling
eb0608f2e9 diable unaigned pointer access temprary, second one. 2017-12-14 17:00:16 +01:00
Kim Kulling
722420c5dc diable unaigned pointer access temprary. 2017-12-14 16:51:47 +01:00
Kim Kulling
422776b479 Merge branch 'master' into master 2017-12-14 16:38:22 +01:00
Alexis Breust
d09df8cc07 Fixed leftover log 2017-12-14 16:18:17 +01:00
Alexis Breust
31a4ccaebb Added support for generating glb2 (binary glTF 2) 2017-12-14 16:11:12 +01:00
Kim Kulling
6a1d2560ac Merge pull request #1634 from ilovezfs/older-zlib
unzip: fix build with older zlib
2017-12-13 17:00:13 +01:00
Alexandre Avenel
50bcaf39fd Fix issue #1623 : crash when loading multiple PLY files
Pointer mGeneratedMesh was not reset to nullptr when transfering ownership
to pScene->mMeshes
2017-12-12 20:48:51 +01:00
Alexandre Avenel
89ff8fc05d Add unit test for issue 1623 2017-12-12 20:34:53 +01:00
Turo Lamminen
89afe0780b B3DImporter: Fix double free when reusing Importer 2017-12-12 20:03:16 +02:00
Turo Lamminen
824dfc314b B3DImporter: Store node animations in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen
08a35d4e1f B3DImporter: Store materials in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen
f1707e920d B3DImporter: Store meshes in unique_ptr 2017-12-12 19:46:11 +02:00
Turo Lamminen
acab4c327e B3DImporter: Store animations in unique_ptr 2017-12-12 19:46:07 +02:00
Turo Lamminen
30ae14fae9 B3DImporter: Add unique_to_array helper function 2017-12-12 18:40:28 +02:00
ilovezfs
f9b599355c unzip: fix build with older zlib
Fixes "unzip.c:150:11: error: unknown type name 'z_crc_t'"
2017-12-12 02:28:03 -08:00
Kim Kulling
949375e695 Merge pull request #1633 from Teybeo/Fix-build-without-3MF
Fix build without 3MF importer
2017-12-11 16:50:04 +01:00
Teybeo
99031997bd Fix 3MF define typo 2017-12-11 16:27:27 +01:00
Teybeo
8cd1ede9ba Fix 3MF define typo 2017-12-11 16:26:45 +01:00
Teybeo
7337474b6c Fix 3MF define typo 2017-12-11 16:26:00 +01:00
Kim Kulling
80799bdbf9 Merge pull request #1631 from assimp/kimkulling-410_prep
Update to 4.1.0
v4.1.0
2017-12-11 14:22:45 +01:00
Kim Kulling
e8139ef515 Update utVersion.cpp
Fix unittests.
2017-12-11 13:30:16 +01:00
Kim Kulling
65d29c5420 Update CMakeLists.txt
Update version
2017-12-11 13:22:20 +01:00
Kim Kulling
406a06705e Update Doxyfile.in
Update version
2017-12-11 13:21:35 +01:00
Kim Kulling
28b01cbdd1 Update to 4.1.0 2017-12-11 13:20:19 +01:00
Daniel Löber
2f93cd77f8 added path conversion code for unicode on windows 2017-12-11 10:28:50 +01:00
Kim Kulling
899748c651 Merge pull request #1627 from assimp/kimkulling-patch-2
Update CREDITS
2017-12-10 18:54:58 +01:00
Kim Kulling
0c2f4abe78 Update CREDITS
Add list of patreons.
2017-12-10 18:25:50 +01:00
Giuseppe Barbieri
3e0b072263 Update FBXBinaryTokenizer.cpp 2017-12-09 23:42:23 +01:00
Kim Kulling
bd8d3025bd Merge pull request #1622 from assimp/fix_model_xml_3mf
fix the model xml
2017-12-07 19:23:03 +01:00
Kim Kulling
972d8517b5 fix the model xml 2017-12-07 17:50:18 +01:00
Kim Kulling
3d4256a7a7 Merge pull request #1620 from assimp/issue_1619
FBX: closes https://github.com/assimp/assimp/issues/1619: return corr…
2017-12-07 13:50:17 +01:00
Kim Kulling
0588d6cccf FBX: closes https://github.com/assimp/assimp/issues/1619: return correct index for embedded textures. 2017-12-07 09:44:48 +01:00
Kim Kulling
26cdec5633 Merge pull request #1618 from assimp/3mf_export_fixes
3MF: fix working test for 3MF-export.
2017-12-07 00:48:26 +01:00
Kim Kulling
c23c63e821 fix correct folder naming scheme. 2017-12-06 22:15:34 +01:00
Kim Kulling
95e9cd75fa 3MF: fix working test for 3MF-export. 2017-12-06 21:41:48 +01:00
Kim Kulling
d3833fe804 Merge pull request #1611 from assimp/kimkulling-patch-2
Update miniz.h
2017-12-04 16:00:53 +01:00
Kim Kulling
36cddcc8b7 Update miniz.h
retrigger CI.
2017-12-04 15:20:23 +01:00
Kim Kulling
fe6608175b Update miniz.h
Fix test against null bytes to push back.
2017-12-04 15:19:34 +01:00
Kim Kulling
a59f0b29d5 Merge pull request #1604 from assimp/kimkulling-miniz-memoryaccessfix
Update miniz.h
2017-12-04 14:39:36 +01:00
Kim Kulling
98cb898463 Merge branch 'master' into kimkulling-miniz-memoryaccessfix 2017-12-04 13:31:00 +01:00