From 5d4a3edca84eab4453165f7d90d786a2b914f58e Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 18 Jan 2021 12:24:26 +0200 Subject: Update qt/qtquick3d-assimp submodule Fixes: QTBUG-89433 Pick-to: dev Change-Id: Iec372c94b541f871f3ed78843656c2dfa1a1f613 Reviewed-by: Iikka Eklund --- .gitmodules | 1 + src/3rdparty/assimp/src | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 46804f477..0e87e838d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "src/3rdparty/assimp/src"] path = src/3rdparty/assimp/src url = ../qtquick3d-assimp.git + branch = qt6_assimp diff --git a/src/3rdparty/assimp/src b/src/3rdparty/assimp/src index 8f0c6b04b..d71020db1 160000 --- a/src/3rdparty/assimp/src +++ b/src/3rdparty/assimp/src @@ -1 +1 @@ -Subproject commit 8f0c6b04b2257a520aaab38421b2e090204b69df +Subproject commit d71020db155e9b2d4dba5562c980c016cde77f4c -- cgit v1.2.3