From 6d2a585e060c6e2aa20527f0a15b3364bc96c5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 20 Sep 2022 23:02:41 +0200 Subject: [PATCH] sceneconverter: minor. --- src/Magnum/SceneTools/Test/SceneConverterTest.cpp | 6 ++---- src/Magnum/SceneTools/sceneconverter.cpp | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp index ca86917a6..8e1137b7b 100644 --- a/src/Magnum/SceneTools/Test/SceneConverterTest.cpp +++ b/src/Magnum/SceneTools/Test/SceneConverterTest.cpp @@ -586,9 +586,8 @@ const struct { #endif "-C", "NonexistentSceneConverter", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.ply")}), "ObjImporter", nullptr, - /* Just a prefix */ "PluginManager::Manager::load(): plugin NonexistentSceneConverter is not static and was not found in nonexistent/sceneconverters\n" - "Available converter plugins: "}, + "Available converter plugins: "}, /* Just a prefix */ {"file coversion begin failed", Containers::array({ "-I", "ObjImporter", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.fbx")}), "ObjImporter", "AnySceneConverter", @@ -634,9 +633,8 @@ const struct { #endif "-M", "NonexistentSceneConverter", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.ply")}), "ObjImporter", nullptr, - /* Just a prefix */ "PluginManager::Manager::load(): plugin NonexistentSceneConverter is not static and was not found in nonexistent/sceneconverters\n" - "Available mesh converter plugins: "}, + "Available mesh converter plugins: "}, /* Just a prefix */ {"plugin doesn't support mesh conversion", Containers::array({ "-I", "ObjImporter", "-M", "StanfordSceneConverter", Utility::Path::join(SCENETOOLS_TEST_DIR, "SceneConverterTestFiles/point.obj"), Utility::Path::join(SCENETOOLS_TEST_OUTPUT_DIR, "SceneConverterTestFiles/whatever.ply")}), "ObjImporter", "StanfordSceneConverter", diff --git a/src/Magnum/SceneTools/sceneconverter.cpp b/src/Magnum/SceneTools/sceneconverter.cpp index 4211298f3..f24ae141d 100644 --- a/src/Magnum/SceneTools/sceneconverter.cpp +++ b/src/Magnum/SceneTools/sceneconverter.cpp @@ -752,8 +752,8 @@ well, the IDs reference attributes of the first mesh.)") Trade::SceneContents contents = ~Trade::SceneContents{}; /* If there are any loose meshes from previous conversion steps, add - them directly instead, and clear the array so the next iteration (if - any) takes them from the importer instead */ + them directly, and clear the array so the next iteration (if any) + takes them from the importer instead */ if(meshes) { if(!(Trade::sceneContentsFor(*converter) & Trade::SceneContent::Meshes)) { Warning{} << "Ignoring" << meshes.size() << "meshes not supported by the converter";