From 6b9b0f555268b5551b81ce651b8e587e396e9ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 18 Aug 2023 13:06:16 +0200 Subject: [PATCH] MeshTools: fix a typo in an assertion message. --- src/Magnum/MeshTools/Compile.cpp | 2 +- src/Magnum/MeshTools/Test/CompileGLTest.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Magnum/MeshTools/Compile.cpp b/src/Magnum/MeshTools/Compile.cpp index 78fa0cf10..6dfc7fcdb 100644 --- a/src/Magnum/MeshTools/Compile.cpp +++ b/src/Magnum/MeshTools/Compile.cpp @@ -95,7 +95,7 @@ GL::Mesh compileInternal(const Trade::MeshData& meshData, GL::Buffer&& indices, Similarly warn if an attribute has a location conflicting with another one (such as ObjectId and Bitangent). */ if(boundAttributes[attribute.location()] != ~UnsignedInt{}) { - Warning{} << "MeshTools::compile(): ignoring" << meshData.attributeName(i) << meshData.attributeId(i) << "as its biding slot is already occupied by" << meshData.attributeName(boundAttributes[attribute.location()]) << meshData.attributeId(boundAttributes[attribute.location()]); + Warning{} << "MeshTools::compile(): ignoring" << meshData.attributeName(i) << meshData.attributeId(i) << "as its binding slot is already occupied by" << meshData.attributeName(boundAttributes[attribute.location()]) << meshData.attributeId(boundAttributes[attribute.location()]); return; } diff --git a/src/Magnum/MeshTools/Test/CompileGLTest.cpp b/src/Magnum/MeshTools/Test/CompileGLTest.cpp index fc1224025..8656c510d 100644 --- a/src/Magnum/MeshTools/Test/CompileGLTest.cpp +++ b/src/Magnum/MeshTools/Test/CompileGLTest.cpp @@ -364,7 +364,7 @@ const struct { VertexFormat::Vector2, 2*sizeof(Vector2), 9, ConflictingAttributesDataStride}, }}, Flag::TextureCoordinates2D, 0, "textured2D.tga", - "ignoring Trade::MeshAttribute::TextureCoordinates 1 as its biding slot is already occupied by Trade::MeshAttribute::TextureCoordinates 0"}, + "ignoring Trade::MeshAttribute::TextureCoordinates 1 as its binding slot is already occupied by Trade::MeshAttribute::TextureCoordinates 0"}, #ifndef MAGNUM_TARGET_GLES2 {"bitangents + object ID", {InPlaceInit, { Trade::MeshAttributeData{Trade::MeshAttribute::Bitangent, @@ -374,7 +374,7 @@ const struct { VertexFormat::UnsignedInt, 3*sizeof(Vector2), 9, ConflictingAttributesDataStride}, }}, Flag::ObjectId, 0, "flat2D.tga", - "ignoring Trade::MeshAttribute::ObjectId 0 as its biding slot is already occupied by Trade::MeshAttribute::Bitangent 0"}, + "ignoring Trade::MeshAttribute::ObjectId 0 as its binding slot is already occupied by Trade::MeshAttribute::Bitangent 0"}, {"object ID + bitangents", {InPlaceInit, { Trade::MeshAttributeData{Trade::MeshAttribute::ObjectId, VertexFormat::UnsignedInt, 3*sizeof(Vector2), @@ -383,7 +383,7 @@ const struct { VertexFormat::Vector3, 3*sizeof(Vector2) + sizeof(UnsignedInt), 9, ConflictingAttributesDataStride}, }}, Flag::ObjectId, 26234, "flat2D.tga", - "ignoring Trade::MeshAttribute::Bitangent 0 as its biding slot is already occupied by Trade::MeshAttribute::ObjectId 0"}, + "ignoring Trade::MeshAttribute::Bitangent 0 as its binding slot is already occupied by Trade::MeshAttribute::ObjectId 0"}, #endif /* Conflicting skinning attributes tested directly in skinning() */ /** @todo test also a conflict with instanced transformation + secondary