Commit Graph

5222 Commits

Author SHA1 Message Date
Kim Kulling
3e9bb23688 Merge pull request #1595 from Matter-and-Form/fix/gltf2-preserve-node-names
[glTF2] Preserve node names when importing
2017-11-28 08:47:49 +01:00
Kim Kulling
8ce5985aa0 Merge branch 'master' into fix/gltf2-preserve-node-names 2017-11-28 00:50:07 +01:00
Kim Kulling
890920110c Merge pull request #1596 from Matter-and-Form/feature/gltf2-tangents
[glTF2] Add support for tangents in import
2017-11-28 00:49:42 +01:00
awefers
0031165789 Add support for tangents in glTF2.0 import
Closes #1562
2017-11-27 13:45:40 -05:00
awefers
0b04ae1d91 Preserve node names when importing glTF2.0
Closes #1522
2017-11-27 11:58:19 -05:00
Kim Kulling
0ce3641deb Merge pull request #1589 from aavenel/fix-typo-gltf
Fix typo on gltf2 camera parameters
2017-11-26 20:52:49 +01:00
Kim Kulling
623b5a515a Merge branch 'master' into fix-typo-gltf 2017-11-25 20:11:49 +01:00
Kim Kulling
44b38263a5 Merge pull request #1590 from aavenel/fix-cmake-unit-win
Copy assimp dll to unit folder on windows
2017-11-25 20:11:22 +01:00
Kim Kulling
b9845285ca Merge branch 'master' into fix-cmake-unit-win 2017-11-25 16:51:37 +01:00
Kim Kulling
a41bef0d54 Merge pull request #1591 from aavenel/fix-warnings-win
Fix all warnings on MSVC14
2017-11-25 12:28:51 +01:00
Alexandre Avenel
eb452b28a2 Fix warning on MSVC14 2017-11-25 11:38:12 +01:00
Alexandre Avenel
d529dd17f9 Fix warning cast double to float 2017-11-24 22:29:58 +01:00
Alexandre Avenel
273f6b0267 Fix MSVC14 warning cast double to real 2017-11-24 22:13:38 +01:00
Alexandre Avenel
f80e8b39a1 Fix warning C4138: '*/' found outside of comment on MSVC14 2017-11-24 22:08:50 +01:00
Alexandre Avenel
c63263b025 Fix typo on gltf2 camera parameters 2017-11-24 22:02:47 +01:00
Alexandre Avenel
d8d5cf1a2d Copy assimp dll to unit folder on windows 2017-11-24 19:50:25 +01:00
Kim Kulling
35819340aa Merge pull request #1588 from elect86/patch-15
Update jvm port supported formats
2017-11-23 14:20:48 +01:00
Kim Kulling
ad2223f1c5 Merge branch 'master' into patch-15 2017-11-23 13:31:39 +01:00
Kim Kulling
a1c1ad74bd Merge pull request #1582 from mrautio/master
Add support for building Mac OS X Framework bundles
2017-11-23 13:31:00 +01:00
Giuseppe Barbieri
fdb52723c4 Update Readme.md 2017-11-22 16:11:46 +01:00
Kim Kulling
d180cfcba5 Merge branch 'master' into master 2017-11-22 16:01:16 +01:00
Kim Kulling
ed4e6b0db0 Merge pull request #1580 from assimp/scene_combiner_crash
check for nullptr dereferencing before copying scene data
2017-11-22 16:00:46 +01:00
Kim Kulling
e35f789ace Merge branch 'master' into scene_combiner_crash 2017-11-22 13:46:14 +01:00
Kim Kulling
ac37977230 Merge pull request #1575 from elect86/patch-12
Update ValidateDataStructure.h, typo
2017-11-22 13:30:07 +01:00
Kim Kulling
6da4258206 Merge branch 'master' into patch-12 2017-11-21 20:03:09 +01:00
Kim Kulling
a2ba3d630d Merge pull request #1586 from turol/validate
Enable data structure validation in cases where it doesn't cause failures
2017-11-21 20:02:28 +01:00
Turo Lamminen
127705d347 Unit tests: Enable data structure validation in cases where it doesn't cause failures 2017-11-21 18:04:22 +02:00
Kim Kulling
70d9df868d Merge branch 'master' into patch-12 2017-11-20 22:23:47 +01:00
Kim Kulling
4cf8e10235 Merge pull request #1585 from pdaehne/master
[glTF2] Moved byteStride from accessor to bufferView
2017-11-20 22:19:22 +01:00
Kim Kulling
ba3acd7459 Merge branch 'master' into patch-12 2017-11-20 19:56:14 +01:00
Patrick Dähne
a05d74a281 [glTF2] Moved byteStride from accessor to bufferView 2017-11-20 19:01:28 +01:00
Kim Kulling
beff88228d Merge branch 'master' into master 2017-11-20 18:56:10 +01:00
Kim Kulling
4502d72ee6 Merge pull request #1584 from pdaehne/master
[glTF2] Implemented reading binary glTF2 (glb) files
2017-11-20 18:55:30 +01:00
Patrick Dähne
6cbfd5b977 [glTF2] Implemented reading binary glTF2 (glb) files 2017-11-20 14:59:05 +01:00
Mika Rautio
9f1dce8e57 Merge branch 'master' into master 2017-11-20 10:27:11 +02:00
Mika Rautio
4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling
2a9f79f958 check for 0 properties before copy them 2017-11-19 19:05:51 +01:00
Kim Kulling
55c9761228 Merge branch 'master' into patch-12 2017-11-19 18:25:22 +01:00
Kim Kulling
9707fde709 check for nullptr dereferencing before copying scene data 2017-11-19 17:41:31 +01:00
Kim Kulling
e1837b6cc8 Merge pull request #1576 from elect86/patch-13
Update ValidateDataStructure.h, typo
2017-11-19 17:38:02 +01:00
Kim Kulling
65d6daa414 Merge branch 'master' into patch-13 2017-11-18 20:36:05 +01:00
Kim Kulling
b408e25a1d Merge pull request #1579 from assimp/fix_android
Fix android
2017-11-18 20:35:54 +01:00
Kim Kulling
1a1d96d3e2 Merge branch 'master' into fix_android 2017-11-18 18:32:58 +01:00
Kim Kulling
a8e65a1e8a Fix android build. 2017-11-18 18:32:16 +01:00
turol
864a080b45 Merge pull request #1578 from turol/warnings
Fix miscellaneous warnings
2017-11-18 18:45:19 +02:00
Turo Lamminen
8ae7231654 Blender: Silence warning about uninitialized member 2017-11-18 16:50:45 +02:00
Turo Lamminen
2c8cc1f732 BlenderDNA: Silence warning about uninitialized member 2017-11-18 16:49:03 +02:00
Turo Lamminen
bcffa28a33 MDLImporter: Don't take address of packed struct member 2017-11-18 16:39:43 +02:00
Turo Lamminen
10f4b6f95c assimp_cmd: Fix strict-aliasing warnings 2017-11-18 16:02:53 +02:00
Turo Lamminen
53119e74f8 Open3DGC: Fix strict-aliasing warnings 2017-11-18 15:59:30 +02:00