diff options
author | Mike Krus <mike.krus@kdab.com> | 2020-11-30 13:34:56 +0000 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2021-01-11 11:15:16 +0000 |
commit | ac9c708d7a34e66922056e5bca84b3cf583d61eb (patch) | |
tree | 9ce6030a1f7d500d10ad6e3b354a52d096a02601 /src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | |
parent | e4a0e92896d65de2bc1ea6786453ae73ecee6f7f (diff) |
Remove QFrameAllocator (again)
Push-to: 6.0
Change-Id: I03ff6cab88d5bb0d279a61fa0a730f32b088b481
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/plugins/sceneparsers/gltfexport/gltfexporter.cpp')
-rw-r--r-- | src/plugins/sceneparsers/gltfexport/gltfexporter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp index 21396b215..e7846d7b5 100644 --- a/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp +++ b/src/plugins/sceneparsers/gltfexport/gltfexporter.cpp @@ -132,11 +132,11 @@ inline QJsonArray col2jsvec(const QColor &color, bool alpha = false) } template <typename T> -inline QJsonArray vec2jsvec(const QVector<T> &v) +inline QJsonArray vec2jsvec(const std::vector<T> &v) { QJsonArray arr; - for (int i = 0; i < v.count(); ++i) - arr << v.at(i); + for (size_t i = 0; i < v.size(); ++i) + arr << v[i]; return arr; } @@ -1738,9 +1738,9 @@ void GLTFExporter::exportMaterials(QJsonObject &materials) // Blend function handling is our own extension used for Phong Alpha material. QJsonObject functions; - if (!matInfo.blendEquations.isEmpty()) + if (!matInfo.blendEquations.empty()) functions["blendEquationSeparate"] = vec2jsvec(matInfo.blendEquations); - if (!matInfo.blendArguments.isEmpty()) + if (!matInfo.blendArguments.empty()) functions["blendFuncSeparate"] = vec2jsvec(matInfo.blendArguments); if (!functions.isEmpty()) commonMat["functions"] = functions; |