qiurui
/
qt3d
mirror of https://github.com/qt/qt3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update assimp submodule 

Change-Id: Ifee3593b8b55ce8ccbdd9cae57f290b1117303d6
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
This commit is contained in:
Jani Heikkinen 2021-06-02 14:13:27 +03:00
parent 18a011bb45
commit 6f55fd683a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "src/3rdparty/assimp/src"]
path = src/3rdparty/assimp/src
url = ../qtquick3d-assimp.git
branch = qt6.1_assimp
branch = qt6_assimp

4
src/3rdparty/assimp/revision.h vendored
View File

@ -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

2
src/3rdparty/assimp/src vendored

@ -1 +1 @@
Subproject commit 1620a72e5820d7c680f6f5da10a3481ceb4e53c2
Subproject commit 5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5