From 0ba5f33f7359e1253a4e88de82c063e8bd4ce463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 30 Aug 2021 12:38:43 +0200 Subject: [PATCH] Trade: consistent terminology in an assert message. --- src/Magnum/Trade/MeshData.cpp | 2 +- src/Magnum/Trade/Test/MeshDataTest.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Magnum/Trade/MeshData.cpp b/src/Magnum/Trade/MeshData.cpp index 44ea4a773..bb6b5558d 100644 --- a/src/Magnum/Trade/MeshData.cpp +++ b/src/Magnum/Trade/MeshData.cpp @@ -140,7 +140,7 @@ MeshData::MeshData(const MeshPrimitive primitive, Containers::Array&& inde if(attribute._isOffsetOnly) { const std::size_t size = attribute._data.offset + (_vertexCount - 1)*attribute._stride + typeSize; CORRADE_ASSERT(!_vertexCount || size <= _vertexData.size(), - "Trade::MeshData: offset attribute" << i << "spans" << size << "bytes but passed vertexData array has only" << _vertexData.size(), ); + "Trade::MeshData: offset-only attribute" << i << "spans" << size << "bytes but passed vertexData array has only" << _vertexData.size(), ); } else { const void* const begin = static_cast(attribute._data.pointer); const void* const end = static_cast(attribute._data.pointer) + (_vertexCount - 1)*attribute._stride + typeSize; diff --git a/src/Magnum/Trade/Test/MeshDataTest.cpp b/src/Magnum/Trade/Test/MeshDataTest.cpp index 1169f45c7..52f9a531d 100644 --- a/src/Magnum/Trade/Test/MeshDataTest.cpp +++ b/src/Magnum/Trade/Test/MeshDataTest.cpp @@ -1665,7 +1665,7 @@ void MeshDataTest::constructAttributeNotContained() { "Trade::MeshData: attribute 0 [0xbadda9:0xbaddc9] is not contained in passed vertexData array [0xbadda9:0xbaddc1]\n" "Trade::MeshData: attribute 1 [0xdead:0xdec5] is not contained in passed vertexData array [0xbadda9:0xbaddc1]\n" "Trade::MeshData: attribute 0 [0xbadda9:0xbaddc1] is not contained in passed vertexData array [0x0:0x0]\n" - "Trade::MeshData: offset attribute 0 spans 25 bytes but passed vertexData array has only 24\n"); + "Trade::MeshData: offset-only attribute 0 spans 25 bytes but passed vertexData array has only 24\n"); } void MeshDataTest::constructInconsitentVertexCount() {