summaryrefslogtreecommitdiffstats
path: root/src/plugins/sceneparsers/assimp/assimpimporter.cpp
Commit message (Expand)AuthorAgeFilesLines
* 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