915ee95ad3
Fx nullptr dereference.
2017-11-30 09:12:41 +01:00
5aa84a2610
Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf
2017-11-30 00:32:51 +01:00
ac23034816
fix the exporter unittest when the export is disabled.
2017-11-30 00:32:37 +01:00
c27fda62e5
Merge branch 'master' into export_3mf
2017-11-30 00:32:23 +01:00
9d224f6ac5
Merge pull request #1603 from Matter-and-Form/fix/gltf-node-name-conflict
...
[gltf2] node name conflict fix
2017-11-30 00:28:28 +01:00
46caecdf35
enable compiler switch test for no exporter requested.
2017-11-29 21:02:52 +01:00
98e98dc40c
Fix node names sharing same name
...
Uses node name if it is set, and globally unique id otherwise.
This may still break in some models (glTF2 spec doesn’t guaruntee name values to be unique). However, I couldn’t cause it to break any further using gltf2 models on hand.
Closes #1600
2017-11-29 12:20:44 -05:00
5c9ed540b2
Add test for GLB import
...
Currently fails (testing the issue in #1600 )
2017-11-29 12:20:44 -05:00
59dcfefeb2
fix unaligned memory access.
2017-11-29 16:45:09 +01:00
fd2da59427
fix unaligned memory access.
2017-11-29 16:23:12 +01:00
b5e79c3cb6
fix invalid include
2017-11-29 16:11:33 +01:00
ddd23fad3f
Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf
2017-11-28 19:05:00 +01:00
e442f5838f
Merge branch 'master' into export_3mf
2017-11-28 15:41:33 +01:00
e17f7010d1
Merge pull request #1599 from assimp/kimkulling-verbose-analyze
...
Update .travis.sh
2017-11-28 15:41:22 +01:00
ef4842e128
Update .travis.sh
...
Make check more verbose.
2017-11-28 15:15:43 +01:00
6a2cd1c91d
Update D3MFExporter.cpp
...
Fix the build
2017-11-28 10:14:23 +01:00
9bd9b3d99c
Merge branch 'master' into export_3mf
2017-11-28 09:24:02 +01:00
e6381b7616
Merge pull request #1594 from Matter-and-Form/fix/gltf2-transforms
...
[glTF2] Fix transform matrices multiplication order
2017-11-28 09:22:01 +01:00
4b6e49ca7b
Update D3MFExporter.h
...
Fix review findings.
2017-11-28 09:09:04 +01:00
4f972661e8
Update D3MFExporter.cpp
...
Fix review findings.
2017-11-28 09:08:16 +01:00
7a395e274f
Merge branch 'master' into fix/gltf2-transforms
2017-11-28 08:48:19 +01:00
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
8ce5985aa0
Merge branch 'master' into fix/gltf2-preserve-node-names
2017-11-28 00:50:07 +01:00
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
09f7769820
remove unused attribute.
2017-11-27 23:36:32 +01:00
8e413ac1e3
Merge branch 'master' into export_3mf
2017-11-27 22:50:17 +01:00
7280dec838
fix unittest.
2017-11-27 22:46:57 +01:00
3dfca3bc84
3MF: add export to a given archive.
2017-11-27 21:48:33 +01:00
0031165789
Add support for tangents in glTF2.0 import
...
Closes #1562
2017-11-27 13:45:40 -05:00
0b04ae1d91
Preserve node names when importing glTF2.0
...
Closes #1522
2017-11-27 11:58:19 -05:00
e53d4735b0
Fix transform matrices multiplication order per glTF2.0 spec
...
Closes #1568
2017-11-27 11:32:05 -05:00
0ce3641deb
Merge pull request #1589 from aavenel/fix-typo-gltf
...
Fix typo on gltf2 camera parameters
2017-11-26 20:52:49 +01:00
623b5a515a
Merge branch 'master' into fix-typo-gltf
2017-11-25 20:11:49 +01:00
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
b9845285ca
Merge branch 'master' into fix-cmake-unit-win
2017-11-25 16:51:37 +01:00
a41bef0d54
Merge pull request #1591 from aavenel/fix-warnings-win
...
Fix all warnings on MSVC14
2017-11-25 12:28:51 +01:00
eb452b28a2
Fix warning on MSVC14
2017-11-25 11:38:12 +01:00
d529dd17f9
Fix warning cast double to float
2017-11-24 22:29:58 +01:00
273f6b0267
Fix MSVC14 warning cast double to real
2017-11-24 22:13:38 +01:00
f80e8b39a1
Fix warning C4138: '*/' found outside of comment on MSVC14
2017-11-24 22:08:50 +01:00
c63263b025
Fix typo on gltf2 camera parameters
2017-11-24 22:02:47 +01:00
d8d5cf1a2d
Copy assimp dll to unit folder on windows
2017-11-24 19:50:25 +01:00
6c59c83e0f
add missing include
2017-11-24 19:48:21 +01:00
0bdb375804
Add missing file export into archive.
2017-11-24 18:59:37 +01:00
09a5946dbd
Prepare archive structure.
2017-11-23 22:47:18 +01:00
35819340aa
Merge pull request #1588 from elect86/patch-15
...
Update jvm port supported formats
2017-11-23 14:20:48 +01:00
ad2223f1c5
Merge branch 'master' into patch-15
2017-11-23 13:31:39 +01:00
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
fdb52723c4
Update Readme.md
2017-11-22 16:11:46 +01:00
d180cfcba5
Merge branch 'master' into master
2017-11-22 16:01:16 +01:00
Kim Kulling
Kim Kulling
Daniel Hritzkiv
awefers
Alexandre Avenel
Giuseppe Barbieri