summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
...
| | * Get rid of the INDEXBITS template argument for QHandleLars Knoll2017-12-131-1/+0
* | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-201-0/+4
|\| |
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Svenn-Arne Dragly2017-11-151-0/+4
| |\|
| | * Deal with trailing spaces and crlfKevin Ottens2017-11-071-0/+4
* | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-133-8/+82
|\| |
| * | Doc: add doc to undocumented classes qt3dv5.10.0-beta2Nico Vertriest2017-10-132-6/+82
| * | Don't warn about buffers with unknown attribute typesSean Harmer2017-10-061-2/+0
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-054-14/+69
|\| |
| * | Merge branch '5.9' into 5.10Sean Harmer2017-09-301-1/+1
| |\|
| | * Don't crash objgeometryloader on ill-formed face, just ignoreWieland Hagen2017-09-221-1/+1
| * | Doc: add doc to class AssimpImporterNico Vertriest2017-09-291-3/+3
| * | Doc: add doc to classes GLTFImporter and GLTFExporterNico Vertriest2017-09-292-4/+54
| * | PhongAlpha: encode the alpha in kdKevin Ottens2017-09-271-6/+11
* | | Replace Q_NULLPTR with nullptrKevin Funk2017-09-251-45/+45
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-259-19/+19
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2512-33/+33
|/ /
* | Merge branch '5.9' into 5.10Sean Harmer2017-09-121-1/+0
|\|
| * Get rid of the AllocationPolicy template argument in the ResourceManagerLars Knoll2017-09-111-1/+0
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-09-012-84/+43
|\|
| * Fix crash when loading multiple assimp scenesMauro Persano2017-08-242-84/+43
* | Merge branch '5.9' into devSean Harmer2017-08-191-0/+34
|\|
| * Fix memory leaks in assimp SceneLoaderMäättä Antti2017-07-201-0/+34
* | Add skinned mesh support to glTF mesh loadingSean Harmer2017-07-281-2/+4
* | Initial support for loading glTF 2 meshesSean Harmer2017-07-282-19/+235
* | 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-214-28/+82
* | Merge branch '5.9' into devSean Harmer2017-05-217-43/+77
|\|
| * Merge branch '5.9.0' into 5.9Sean Harmer2017-05-204-28/+32
| |\
| | * Merge remote-tracking branch 'origin/5.9' into 5.9.0Oswald Buddenhagen2017-05-082-12/+36
| | |\
| | * \ Merge 5.9 into 5.9.0Oswald Buddenhagen2017-05-042-3/+9
| | |\ \
| | * | | Use non-template version of QVariant::value (clazy reports)Mike Krus2017-05-021-1/+1
| | * | | Remove unneeded temporary container (clazy reports)Mike Krus2017-05-022-6/+10
| | * | | Add qAsConst, range-loop might detach Qt container (clazy reports)Mike Krus2017-05-023-8/+8
| | * | | Add missing reference in range-for with non trivial type (clazy reports)Mike Krus2017-05-022-19/+19
| * | | | Fix build with QT_STRICT_ITERATORSSergio Martins2017-05-191-1/+1
| | |_|/ | |/| |
| * | | AssimpImporter: properly handle texture wrappingPaul Lemire2017-05-052-12/+36
| | |/ | |/|
| * | Modify configure to build with no assimpMäättä Antti2017-04-271-2/+3
| * | Fix build for -no-feature-regularexpressionStephan Binner2017-04-272-2/+2
| * | Fix build for -no-feature-temporaryfileStephan Binner2017-04-271-1/+6
| |/
| * AssimpRawTextureImage: fix creation of QTextureImageDataPtrPaul Lemire2017-04-271-2/+3
* | Merge branch '5.9' into devSean Harmer2017-04-0314-35/+1634
|\|
| * Merge "Merge branch '5.8' into 5.9" into refs/staging/5.9Sean Harmer2017-04-026-25/+1619
| |\
| | * Merge branch '5.8' into 5.9Sean Harmer2017-04-026-25/+1619
| | |\
| | | * Fixes includes to comply with coding conventions for Src/sceneRobert Brock2017-04-016-45/+43
| | | * Use QTextureLoader for textures in GLTF filesMauro Persano2017-01-101-10/+3
| * | | Disable two functions not currently in useThiago Macieira2017-04-021-0/+2
| |/ /
| * | Don't explicitly disable the Qt3D category loggingLaszlo Agocs2017-03-319-9/+9
| * | Update assimp lib to 3.3.1Andy Maloney2017-03-141-1/+4
* | | Don't allocate temporary containers while iteratingSergio Martins2017-04-022-2/+2
|/ /