summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@qt.io>2021-06-02 14:13:27 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2021-06-02 15:19:37 +0300
commit6f55fd683a0a9128408a5811fc010ff78d5830c4 (patch)
tree7be912e272f43aec3a08aaa3e4ffff51e2ddbd8a /src
parent18a011bb45fcf1206c6dae1ba61a25382d041030 (diff)
Update assimp submodule
Change-Id: Ifee3593b8b55ce8ccbdd9cae57f290b1117303d6 Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/assimp/revision.h4
m---------src/3rdparty/assimp/src0
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/assimp/revision.h b/src/3rdparty/assimp/revision.h
index ab3f04742..3b9653281 100644
--- a/src/3rdparty/assimp/revision.h
+++ b/src/3rdparty/assimp/revision.h
@@ -1,7 +1,7 @@
#ifndef ASSIMP_REVISION_H_INC
#define ASSIMP_REVISION_H_INC
-#define GitVersion 0xb3e1ee3c
+#define GitVersion 0x5a38cd0a
#define GitBranch "HEAD"
#define VER_MAJOR 5
@@ -16,7 +16,7 @@
#if (GitVersion == 0)
#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD)
#else
-#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit b3e1ee3c)"
+#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit 5a38cd0a)"
#endif
#ifdef NDEBUG
diff --git a/src/3rdparty/assimp/src b/src/3rdparty/assimp/src
-Subproject 1620a72e5820d7c680f6f5da10a3481ceb4e53c
+Subproject 5a38cd0a03015ceabbd5bc6efb0730dde1ef74e