summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers/assimp/assimpimporter.h
Commit message (Expand)AuthorAgeFilesLines
* AssimpImporter: remove unused QMapMarc Mutz2019-07-221-2/+0
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-151-1/+0
|\
| * Merge remote-tracking branch 'origin/5.9' into 5.10Sean Harmer2018-02-051-1/+0
| |\
| | * Cleanup AssimpImporterPaul Lemire2018-02-011-1/+0
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-251-5/+5
|/ /
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-09-011-12/+6
|\|
| * Fix crash when loading multiple assimp scenesMauro Persano2017-08-241-12/+6
* | Add support to load data from memory for scene loadersMike Krus2017-05-211-2/+4
|/
* AssimpImporter: properly handle texture wrappingPaul Lemire2017-05-051-1/+0
* Merge branch '5.8' into 5.9Sean Harmer2017-04-021-5/+7
* Move animations from extras to animationsAntti Määttä2017-02-071-3/+3
* Animation support for Qt3DAntti Määttä2017-01-311-0/+8
* Renaming Scene IO classes to scene import classesOtto Ryynänen2016-10-101-0/+154