diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-05-26 10:35:32 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-04 10:09:11 +0200 |
| commit | 1cb807d440cc0d434bfd02fd0c699447b788b8ba (patch) | |
| tree | f28f64fba6ebb30449c3301a75bba2b233b1f34e /src/3rdparty/assimp/code/NDOLoader.cpp | |
| parent | a45b8308ada361872502a678a12f08cff1760c64 (diff) | |
Upgrade to Assimp 3.1
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>
Diffstat (limited to 'src/3rdparty/assimp/code/NDOLoader.cpp')
| -rw-r--r-- | src/3rdparty/assimp/code/NDOLoader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/assimp/code/NDOLoader.cpp b/src/3rdparty/assimp/code/NDOLoader.cpp index af10a0738..65306b396 100644 --- a/src/3rdparty/assimp/code/NDOLoader.cpp +++ b/src/3rdparty/assimp/code/NDOLoader.cpp @@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "AssimpPCH.h" -#ifndef AI_BUILD_NO_NDO_IMPORTER +#ifndef ASSIMP_BUILD_NO_NDO_IMPORTER #include "NDOLoader.h" using namespace Assimp; |