RichardTea
|
fa1d2f09db
|
Merge branch 'master' into bug-3177-dae-geo-id
|
2020-05-05 09:33:48 +01:00 |
Kim Kulling
|
ddee1b1ddb
|
Merge branch 'master' into aaronfranke-file-formatting
|
2020-05-05 10:21:46 +02:00 |
kkulling
|
4e16716924
|
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
|
2020-05-05 10:17:52 +02:00 |
|
Kim Kulling
|
bf95d1da7c
|
fix conversion
|
2020-05-04 21:48:46 +02:00 |
|
RichardTea
|
8e73984a11
|
Collada Root Nodes aren't allowed to have meshes
Create a null parent node instead
|
2020-05-04 17:47:09 +01:00 |
|
RichardTea
|
6e200cb0d3
|
Merge branch 'master' into bug-3177-dae-geo-id
Impossible merge, have discarded upstream
|
2020-05-04 13:59:09 +01:00 |
|
RichardTea
|
ea917bd4ae
|
Move Collada into AssetLib folder
Should make the merge easier
|
2020-05-04 13:54:49 +01:00 |
Kim Kulling
|
91fa9a102b
|
closes https://github.com/assimp/assimp/issues/3181: fix typo for light type.
|
2020-05-03 12:17:32 +02:00 |
|
Kim Kulling
|
3b06f57150
|
add missing inclde +
|
2020-05-02 21:11:47 +02:00 |
|
Kim Kulling
|
514593548d
|
add assert-test for nullptr.
|
2020-05-02 21:07:41 +02:00 |
|
Kim Kulling
|
3329e76263
|
closes https://github.com/assimp/assimp/issues/3178: throw exception in case of invalid export stream.
|
2020-05-02 21:06:55 +02:00 |
|
Kim Kulling
|
f8e6512a63
|
Move format importer and exporter into its won folder.
|
2020-05-02 15:14:38 +02:00 |