From a35ce64752035a1c1bf147a3b13862aea0c76fc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 30 Jun 2014 01:15:13 +0200 Subject: [PATCH] MeshTools: make compile() actually working with indexed meshes. I was drunk out of my mind. Apparently didn't test once. --- src/Magnum/MeshTools/Compile.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Magnum/MeshTools/Compile.cpp b/src/Magnum/MeshTools/Compile.cpp index b7243cf79..4f0c979d4 100644 --- a/src/Magnum/MeshTools/Compile.cpp +++ b/src/Magnum/MeshTools/Compile.cpp @@ -83,7 +83,7 @@ std::tuple, std::unique_ptr> compile(const std::tie(indexData, indexType, indexStart, indexEnd) = MeshTools::compressIndices(meshData.indices()); indexBuffer.reset(new Buffer{Buffer::Target::ElementArray}); - indexBuffer->setData(data, usage); + indexBuffer->setData(indexData, usage); mesh.setCount(meshData.indices().size()) .setIndexBuffer(*indexBuffer, 0, indexType, indexStart, indexEnd); @@ -155,12 +155,12 @@ std::tuple, std::unique_ptr> compile(const std::tie(indexData, indexType, indexStart, indexEnd) = MeshTools::compressIndices(meshData.indices()); indexBuffer.reset(new Buffer{Buffer::Target::ElementArray}); - indexBuffer->setData(data, usage); + indexBuffer->setData(indexData, usage); mesh.setCount(meshData.indices().size()) .setIndexBuffer(*indexBuffer, 0, indexType, indexStart, indexEnd); /* Else set vertex count */ - } mesh.setCount(meshData.positions(0).size()); + } else mesh.setCount(meshData.positions(0).size()); return std::make_tuple(std::move(mesh), std::move(vertexBuffer), std::move(indexBuffer)); }