47c422ea49
Fix non-ascii encoding in comments in FBXMaterial.cpp.
...
It looks like it was just saved with a wrong encoding,
as these 0xB4 characters were in place of "'".
Also converted tabs to spaces to match indent in the rest of the file.
2017-12-17 16:40:12 +01:00
d081b4ab4e
Merge branch 'master' into fix_clang5_issue
2017-12-17 16:11:44 +01:00
13dba835a0
Merge pull request #1640 from wanadev/gltf2-exporter-improvements
...
Added support for generating glb2 (binary glTF 2)
2017-12-17 16:09:24 +01:00
efc893a139
Merge branch 'master' into gltf2-exporter-improvements
2017-12-17 09:39:14 +01:00
99f2721611
Merge pull request #1636 from aavenel/fix_1623
...
Fix #1623 : crash when loading multiple PLY files
2017-12-17 09:38:55 +01:00
3d743151ce
Merge branch 'master' into fix_1623
2017-12-17 09:04:08 +01:00
cb17a7d81e
Merge pull request #1635 from turol/unique_ptr
...
Use unique_ptr in B3DImporter
2017-12-17 09:03:03 +01:00
0bcf5c22db
Merge branch 'master' into unique_ptr
2017-12-17 02:16:48 +01:00
144e325a4d
Merge pull request #1643 from mesilliac/fix_gltf_exporter_define_name
...
Fix incorrect NO_GLTF_IMPORTER define name in glTFExporter.h
2017-12-17 02:16:02 +01:00
74319a6a50
Merge branch 'master' into fix_gltf_exporter_define_name
2017-12-17 00:30:56 +01:00
d46f8ee625
Merge pull request #1626 from elect86/master
...
typo + remove redundant code
2017-12-17 00:30:20 +01:00
05f8af950a
Merge branch 'master' into master
2017-12-16 19:56:41 +01:00
2c3b2285ed
Merge pull request #1637 from turol/clang
...
Clang 5.0 fixes
2017-12-16 19:56:27 +01:00
463dec5c7e
Change StreamReader::IncPtr argument to signed
...
Negative values are passed to it so it needs to be signed
2017-12-16 15:48:01 +02:00
2f082340fc
MDLLoader: Add workaround for clang 5.0 build issue
2017-12-16 15:48:01 +02:00
87462165b5
Fix bad pointer arithmetic in aiVector2
...
Trying to reference 'y' via pointer arithmetic on 'x' is UB
2017-12-16 15:48:01 +02:00
45ad63f373
Remove packed attribute from aiVector2
...
Returning a reference to a member of packed member is UB
2017-12-16 15:48:01 +02:00
276fc5f466
Remove packed attribute from aiUVTransform
...
It would cause a warning when removing packed from aiVector2
2017-12-16 15:48:01 +02:00
068d4aa4cb
Disable clang static analysis for now
...
Travis updated to clang 5.0 and there are new issues.
2017-12-16 15:48:01 +02:00
379562055b
Fix incorrect NO_GLTF_IMPORTER define name in glTFExporter.h
2017-12-15 23:18:45 +01:00
32e5e3a576
Forgot to uncomment isBinary
2017-12-15 15:40:31 +01:00
5e63ba9a9d
typo.
2017-12-14 18:10:42 +01:00
dec3e2ba42
XGLLoader: fix const issue when seeting vec2.
2017-12-14 18:06:28 +01:00
bef219a2d9
fix access violation in vector2.
2017-12-14 17:59:23 +01:00
245b9b4bb1
fix typo.
2017-12-14 17:52:47 +01:00
e0649b6822
fix misalignment in vector2 [] operator, the non-const one.
2017-12-14 17:42:59 +01:00
d29173aaa9
Following specification for padding
2017-12-14 17:32:18 +01:00
151d71bc69
fix misalignment in vector2 [] operator.
2017-12-14 17:21:17 +01:00
d3876f6e29
Merge branch 'master' into gltf2-exporter-improvements
2017-12-14 17:07:30 +01:00
eb0608f2e9
diable unaigned pointer access temprary, second one.
2017-12-14 17:00:16 +01:00
722420c5dc
diable unaigned pointer access temprary.
2017-12-14 16:51:47 +01:00
422776b479
Merge branch 'master' into master
2017-12-14 16:38:22 +01:00
d09df8cc07
Fixed leftover log
2017-12-14 16:18:17 +01:00
31a4ccaebb
Added support for generating glb2 (binary glTF 2)
2017-12-14 16:11:12 +01:00
6a1d2560ac
Merge pull request #1634 from ilovezfs/older-zlib
...
unzip: fix build with older zlib
2017-12-13 17:00:13 +01:00
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
89ff8fc05d
Add unit test for issue 1623
2017-12-12 20:34:53 +01:00
89afe0780b
B3DImporter: Fix double free when reusing Importer
2017-12-12 20:03:16 +02:00
824dfc314b
B3DImporter: Store node animations in unique_ptr
2017-12-12 19:46:11 +02:00
08a35d4e1f
B3DImporter: Store materials in unique_ptr
2017-12-12 19:46:11 +02:00
f1707e920d
B3DImporter: Store meshes in unique_ptr
2017-12-12 19:46:11 +02:00
acab4c327e
B3DImporter: Store animations in unique_ptr
2017-12-12 19:46:07 +02:00
30ae14fae9
B3DImporter: Add unique_to_array helper function
2017-12-12 18:40:28 +02:00
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
949375e695
Merge pull request #1633 from Teybeo/Fix-build-without-3MF
...
Fix build without 3MF importer
2017-12-11 16:50:04 +01:00
99031997bd
Fix 3MF define typo
2017-12-11 16:27:27 +01:00
8cd1ede9ba
Fix 3MF define typo
2017-12-11 16:26:45 +01:00
7337474b6c
Fix 3MF define typo
2017-12-11 16:26:00 +01:00
80799bdbf9
Merge pull request #1631 from assimp/kimkulling-410_prep
...
Update to 4.1.0
2017-12-11 14:22:45 +01:00
e8139ef515
Update utVersion.cpp
...
Fix unittests.
2017-12-11 13:30:16 +01:00
Tommy
Kim Kulling
Turo Lamminen
Alexis Breust
Kim Kulling
A. Breust
Alexandre Avenel
ilovezfs
Teybeo