From d5927a9fb64b3e54e6050b24cb5e0dc04e8d1174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 11 Jan 2022 18:19:05 +0100 Subject: [PATCH] MeshTools: fix outdated naming in a test. VertexFormat used to be an (excessively long) MeshAttributeType and apparently I didn't clean up all cases yet. --- src/Magnum/MeshTools/Test/ConcatenateTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Magnum/MeshTools/Test/ConcatenateTest.cpp b/src/Magnum/MeshTools/Test/ConcatenateTest.cpp index 1827a75f1..d62204d01 100644 --- a/src/Magnum/MeshTools/Test/ConcatenateTest.cpp +++ b/src/Magnum/MeshTools/Test/ConcatenateTest.cpp @@ -48,7 +48,7 @@ struct ConcatenateTest: TestSuite::Tester { void concatenateUnsupportedPrimitive(); void concatenateInconsistentPrimitive(); - void concatenateInconsistentAttributeType(); + void concatenateInconsistentAttributeFormat(); void concatenateInconsistentAttributeArraySize(); void concatenateIntoNoMeshes(); }; @@ -66,7 +66,7 @@ ConcatenateTest::ConcatenateTest() { &ConcatenateTest::concatenateUnsupportedPrimitive, &ConcatenateTest::concatenateInconsistentPrimitive, - &ConcatenateTest::concatenateInconsistentAttributeType, + &ConcatenateTest::concatenateInconsistentAttributeFormat, &ConcatenateTest::concatenateInconsistentAttributeArraySize, &ConcatenateTest::concatenateIntoNoMeshes}); } @@ -577,7 +577,7 @@ void ConcatenateTest::concatenateInconsistentPrimitive() { "MeshTools::concatenateInto(): expected MeshPrimitive::Triangles but got MeshPrimitive::Lines in mesh 1\n"); } -void ConcatenateTest::concatenateInconsistentAttributeType() { +void ConcatenateTest::concatenateInconsistentAttributeFormat() { #ifdef CORRADE_NO_ASSERT CORRADE_SKIP("CORRADE_NO_ASSERT defined, can't test assertions"); #endif