summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/assimp/code/MDLMaterialLoader.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Update assimp lib to 3.3.1Andy Maloney2017-03-141-715/+723
| | | | | | | | The currently included assimp lib is v3.0 from 2012. This updates assimp lib to the latest released version (3.3.1). Change-Id: I15a60e3150c0b268422f23137107b34e4c5c4342 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Re-add libassimp 3.1.1 to 3rd partyAndy Nichols2015-08-021-0/+827
| | | | | | | | | | | | | | | | | Previously the assimp library was a dependency that was always built, but it is possible to use an external system version if one is available. It is however non- trivial to provide the dependency on platforms other than Linux, so now we provide a copy of libassimp for use when it is not already available. This commit is a combination of reverting commit 672b3e47299f6ba0034f73b252d0436b55fb3085 which removed assimp and introduced the scene parser, and adding the logic to use the system version when available. Change-Id: Ia05f9a92b8d82f19a0db3588b2bbeafe71404386 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Assimp external dependencyPaul Lemire2014-08-191-827/+0
| | | | | | | | The AssimpParser is now a SceneParser plugin that is build if config tests for assimp succeed. Change-Id: I0e3f6a6ce2a43298b71b0261084f6c79521f214d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Upgrade to Assimp 3.1Paul Lemire2014-06-041-1/+0
| | | | | | | | | | | | | | | | https://github.com/assimp/assimp/releases/tag/v3.1 This commit imports assimp 3.1, including CHANGES, CREDITS, LICENSE, README, Readme.md, revision.h and code, contrib, include directories. contrib/zlib was excluded. assimp.pri was also updated. Uses zlib from system or qt instead of contrib/zlib. Task-number: QTBUG-39251 Change-Id: Ia0b446dcd9bc867d65897b9e2b157f6544ccaeac Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Updated Assimp library to the latest version 1270Paul Lemire2014-03-251-717/+718
| | | | | | | | | SVNRevision 1270 assimp--3.0.1270-source-only.zip Change-Id: I332efb5fd0d086f24aca0a5fe9d396d549e531fa Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Moved Assimp to src/3rdpartyPaul Lemire2014-03-211-0/+827
Change-Id: Ic813285c2ee6a36d0e8e6dc6807d6d55f7ec1df4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 02:51:07 +0000