diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2019-08-07 07:47:31 +0200 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2019-08-07 08:33:30 +0200 |
commit | fd64e870fad0e619704e79689f20645760dbdc0e (patch) | |
tree | e5ef1654a217bf82f0bb3549d1c8f1762f1a9f25 /src/plugins/sceneparsers/gltf/gltfimporter.cpp | |
parent | 44470868450c440ca874ba585e2b71dfc8e89f1d (diff) | |
parent | 8af94d9a048f7d26a8137c3c51dcf47605fcf4b6 (diff) |
Merge "Merge remote-tracking branch 'qt-gerrit/dev' into wip/refactor"
Diffstat (limited to 'src/plugins/sceneparsers/gltf/gltfimporter.cpp')
-rw-r--r-- | src/plugins/sceneparsers/gltf/gltfimporter.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/plugins/sceneparsers/gltf/gltfimporter.cpp b/src/plugins/sceneparsers/gltf/gltfimporter.cpp index 7cda33113..a10a83cca 100644 --- a/src/plugins/sceneparsers/gltf/gltfimporter.cpp +++ b/src/plugins/sceneparsers/gltf/gltfimporter.cpp @@ -1514,16 +1514,6 @@ void GLTFImporter::processJSONBufferView(const QString &id, const QJsonObject& j } else { target = targetValue.toInt(); } - Qt3DRender::QBuffer::BufferType ty(Qt3DRender::QBuffer::VertexBuffer); - - switch (target) { - case GL_ARRAY_BUFFER: ty = Qt3DRender::QBuffer::VertexBuffer; break; - case GL_ELEMENT_ARRAY_BUFFER: ty = Qt3DRender::QBuffer::IndexBuffer; break; - default: - qCWarning(GLTFImporterLog, "buffer %ls unsupported target: %d", - qUtf16PrintableImpl(id), target); - return; - } quint64 offset = 0; const auto byteOffset = json.value(KEY_BYTE_OFFSET); @@ -1541,7 +1531,6 @@ void GLTFImporter::processJSONBufferView(const QString &id, const QJsonObject& j } Qt3DRender::QBuffer *b = new Qt3DRender::QBuffer(); - b->setType(ty); b->setData(bytes); m_buffers[id] = b; } |