diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/3rdparty/patches/0005-assimp-Fix-build-FBXConverter.patch | |
parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/3rdparty/patches/0005-assimp-Fix-build-FBXConverter.patch')
-rw-r--r-- | src/3rdparty/patches/0005-assimp-Fix-build-FBXConverter.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/3rdparty/patches/0005-assimp-Fix-build-FBXConverter.patch b/src/3rdparty/patches/0005-assimp-Fix-build-FBXConverter.patch deleted file mode 100644 index 9290b30aa..000000000 --- a/src/3rdparty/patches/0005-assimp-Fix-build-FBXConverter.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1e39e6b296b94852e73adea1cb652adda435529e Mon Sep 17 00:00:00 2001 -From: Anton Kudryavtsev <a.kudryavtsev@netris.ru> -Date: Mon, 21 Mar 2016 16:43:43 +0300 -Subject: [PATCH] assimp: Fix build FBXConverter. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If you compile according to https://wiki.qt.io/Qt5ForAndroidBuilding -with NDK v11.b, you get such warning and the compilation stops: - -FBXConverter.cpp:1262:19: warning: ‘count’ may be used uninitialized in this function [-Wmaybe-uninitialized] - unsigned int count; - -Change-Id: Ieff61e6302800a22080f837267982fd2ea3129e6 ---- - src/3rdparty/assimp/code/FBXConverter.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/assimp/code/FBXConverter.cpp b/src/3rdparty/assimp/code/FBXConverter.cpp -index 56643bc..c6ef8c9 100644 ---- a/src/3rdparty/assimp/code/FBXConverter.cpp -+++ b/src/3rdparty/assimp/code/FBXConverter.cpp -@@ -1259,7 +1259,7 @@ private: - // taking notes so we don't need to do it twice. - BOOST_FOREACH(WeightIndexArray::value_type index, indices) { - -- unsigned int count; -+ unsigned int count = 0; - const unsigned int* const out_idx = geo.ToOutputVertexIndex(index, count); - - index_out_indices.push_back(no_index_sentinel); --- -1.9.1 - |