Commit Graph

5310 Commits

Author SHA1 Message Date
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
Kim Kulling
151d71bc69 fix misalignment in vector2 [] operator. 2017-12-14 17:21:17 +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
6a1d2560ac Merge pull request #1634 from ilovezfs/older-zlib
unzip: fix build with older zlib
2017-12-13 17:00:13 +01: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
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
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
Kim Kulling
b92c3ca161 fix invalid op 2017-12-04 13:19:34 +01:00
Kim Kulling
75b31377fc Merge pull request #1606 from elect86/patch-16
Update MD3Loader.cpp, using index
2017-12-02 23:40:58 +01:00
Kim Kulling
b8ab90ae4b Merge branch 'master' into patch-16 2017-12-02 21:15:54 +01:00
turol
ed361f0b53 Merge pull request #1608 from turol/analyze
Re-enable Clang static analyzer
2017-12-02 18:36:13 +02:00
Turo Lamminen
45f2f31011 miniz: Remove some dead assignments 2017-12-02 17:59:04 +02:00
Turo Lamminen
26f749fcd2 Re-enable Clang static analysis 2017-12-02 17:58:33 +02:00
turol
5702b907d4 Merge pull request #1607 from turol/unique_ptr
Replace ScopeGuard with C++11 std::unique_ptr
2017-12-02 17:57:35 +02:00
Turo Lamminen
2c3558fdd0 Remove ScopeGuard 2017-12-02 17:24:19 +02:00
Turo Lamminen
b60d84a8a2 C4D: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:23:49 +02:00
Turo Lamminen
bd4f024562 XGLLoader: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:22:19 +02:00
Turo Lamminen
e8eccfa27d FBX: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:19:18 +02:00
Turo Lamminen
6f50be82aa 3MF: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:15:57 +02:00
Turo Lamminen
f35d5952dc BlenderLoader: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:13:43 +02:00
Turo Lamminen
af8e297e0f BaseImporter: Replace ScopeGuard with std::unique_ptr 2017-12-02 17:10:06 +02:00
Giuseppe Barbieri
42c1c733b9 Update MD3Loader.cpp 2017-12-01 15:20:50 +01:00
Kim Kulling
77b0aa4f4b Merge pull request #1602 from Matter-and-Form/fix/multibody-binary-stls
Restore import of multi mesh binary STLs
2017-12-01 01:10:34 +01:00
Kim Kulling
2897433358 Update miniz.h
Add an assertion test and return true to not change the expected behaviour of buggy function.
2017-11-30 10:47:52 +01:00
Kim Kulling
4811c0bdd1 Merge branch 'master' into fix/multibody-binary-stls 2017-11-30 10:13:56 +01:00