Commit Graph

167 Commits

Author SHA1 Message Date
Malcolm Tyrrell
b7c789da67 Stop concatenating std::strings. Use formatter. 2020-08-18 17:35:08 +01:00
Malcolm Tyrrell
0ffcdf160e Build formatting into DeadlyImportError 2020-08-18 16:32:34 +01:00
Kim Kulling
21678df589 ogre + collada migration. 2020-07-10 22:25:38 +02:00
Kim Kulling
77b705048b fix merge issues. 2020-07-04 13:42:23 +02:00
Kim Kulling
b1369d0912 next steps. 2020-07-02 15:18:59 +02:00
Kim Kulling
fb20e15163 start to migrate colladat and amf 2020-06-27 15:57:06 +02:00
Kim Kulling
6205af4efb replace NULL and avoid ai_assert with more than 2 tests. 2020-06-23 21:05:42 +02:00
Kim Kulling
2be731d1bf Merge branch 'master' into pugi_xml 2020-05-22 10:09:46 +02:00
Kim Kulling
ecfca1d5c5 Merge branch 'master' into verboseLogging 2020-05-21 18:30:52 +02:00
Kim Kulling
cfbdacb02a Merge branch 'master' into bug-3201-collada_root_meshes 2020-05-16 20:50:34 +02:00
Malcolm Tyrrell
434c5e3d37 More verbose logging 2020-05-15 17:29:49 +01:00
kimkulling
464d4cf99a Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master 2020-05-15 15:08:30 +02:00
RichardTea
56a4e61533 Collada: Don't copy the scene when exporting
This was purely to add a virtual top-level node
Use a flag instead.
Also add more const
2020-05-05 10:16:13 +01:00
RichardTea
6e447b2c44 Merge branch 'bug-3177-dae-geo-id' into bug-3201-collada_root_meshes 2020-05-05 09:52:08 +01:00
RichardTea
d1ae6ac77a Fix typo in <visual_scene>
Swapped Id and Name
2020-05-05 09:51:41 +01: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
ea917bd4ae Move Collada into AssetLib folder
Should make the merge easier
2020-05-04 13:54:49 +01:00