summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers/assimp/assimpimporter.cpp
Commit message (Expand)AuthorAgeFilesLines
* Doc: Remove private classes from public documentationPaul Wicking2018-07-111-0/+1
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-201-3/+3
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-151-9/+10
|\
| * Merge remote-tracking branch 'origin/5.9' into 5.10Sean Harmer2018-02-051-9/+10
| |\
| | * Cleanup AssimpImporterPaul Lemire2018-02-011-9/+10
* | | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-0/+1
|\| |
| * | Fix warning about unused variableThiago Macieira2018-01-301-0/+1
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-221-0/+1
|\| |
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-221-0/+1
| |\|
| | * AssimpImporter: disable default mirroring on texturesPaul Lemire2018-01-221-0/+1
* | | Merge branch '5.10' into devSean Harmer2018-01-171-1/+1
|\| |
| * | Iterate on references to avoid copiesMike Krus2018-01-131-1/+1
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-051-3/+3
|\| |
| * | Doc: add doc to class AssimpImporterNico Vertriest2017-09-291-3/+3
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-251-3/+3
|/ /
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-09-011-72/+37
|\|
| * Fix crash when loading multiple assimp scenesMauro Persano2017-08-241-72/+37
* | Merge branch '5.9' into devSean Harmer2017-08-191-0/+34
|\|
| * Fix memory leaks in assimp SceneLoaderMäättä Antti2017-07-201-0/+34
* | Merge branch '5.9' into devSean Harmer2017-06-191-1/+1
|\|
| * Fix crash when loading fbx file with embedded texturesMounir BOUDRIFA2017-05-301-1/+1
* | Add support to load data from memory for scene loadersMike Krus2017-05-211-11/+47
|/
* Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-081-11/+36
|\
| * AssimpImporter: properly handle texture wrappingPaul Lemire2017-05-051-11/+36
* | Add qAsConst, range-loop might detach Qt container (clazy reports)Mike Krus2017-05-021-3/+3
|/
* AssimpRawTextureImage: fix creation of QTextureImageDataPtrPaul Lemire2017-04-271-2/+3
* Merge branch '5.8' into 5.9Sean Harmer2017-04-021-9/+14
* Don't explicitly disable the Qt3D category loggingLaszlo Agocs2017-03-311-1/+1
* Update assimp lib to 3.3.1Andy Maloney2017-03-141-1/+4
* Move animations from extras to animationsAntti Määttä2017-02-071-20/+20
* Animation support for Qt3DAntti Määttä2017-01-311-7/+342
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-121-2/+0
* Renaming Scene IO classes to scene import classesOtto Ryynänen2016-10-101-0/+986