Skip to content

Commit a35ce64

Browse files
committed
MeshTools: make compile() actually working with indexed meshes.
I was drunk out of my mind. Apparently didn't test once.
1 parent 50897e0 commit a35ce64

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Magnum/MeshTools/Compile.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ std::tuple<Mesh, std::unique_ptr<Buffer>, std::unique_ptr<Buffer>> compile(const
8383
std::tie(indexData, indexType, indexStart, indexEnd) = MeshTools::compressIndices(meshData.indices());
8484

8585
indexBuffer.reset(new Buffer{Buffer::Target::ElementArray});
86-
indexBuffer->setData(data, usage);
86+
indexBuffer->setData(indexData, usage);
8787
mesh.setCount(meshData.indices().size())
8888
.setIndexBuffer(*indexBuffer, 0, indexType, indexStart, indexEnd);
8989

@@ -155,12 +155,12 @@ std::tuple<Mesh, std::unique_ptr<Buffer>, std::unique_ptr<Buffer>> compile(const
155155
std::tie(indexData, indexType, indexStart, indexEnd) = MeshTools::compressIndices(meshData.indices());
156156

157157
indexBuffer.reset(new Buffer{Buffer::Target::ElementArray});
158-
indexBuffer->setData(data, usage);
158+
indexBuffer->setData(indexData, usage);
159159
mesh.setCount(meshData.indices().size())
160160
.setIndexBuffer(*indexBuffer, 0, indexType, indexStart, indexEnd);
161161

162162
/* Else set vertex count */
163-
} mesh.setCount(meshData.positions(0).size());
163+
} else mesh.setCount(meshData.positions(0).size());
164164

165165
return std::make_tuple(std::move(mesh), std::move(vertexBuffer), std::move(indexBuffer));
166166
}

0 commit comments

Comments
 (0)