From 2caaddbeaab23c816c36b48ac87042bae5923e36 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 6 Sep 2023 21:55:16 -0500 Subject: [PATCH 1/2] Fix incorrect format specifier. --- Sources/Tools/MaxConvert/hsMaterialConverter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp index 3816e4dd26..156dc3f551 100644 --- a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp +++ b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp @@ -1607,7 +1607,7 @@ hsGMaterial *hsMaterialConverter::IProcessCompositeMtl(Mtl *mtl, plMaxNode *node { bool ignore = fErrorMsg->Set(!(fWarned & kWarnedCompMtlBadBlend), node->GetName(), ST::format( - "Composite material %s has a submaterial, %s, that requires too many textures in a single pass " + "Composite material {} has a submaterial, {}, that requires too many textures in a single pass " "(for blending effects). To cut this down, try some of the following:\n" "1. Make sure all multi-layered submaterials (except the base)" " choose 'alpha' for 'layer blending', and 'base alpha only' for 'layer alpha blending'\n" From 3c22b1e848736e6be8e2843d175ed1510aa33fa1 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 6 Sep 2023 21:55:37 -0500 Subject: [PATCH 2/2] Fix potential ODR violation. --- Sources/Tools/MaxConvert/hsMaterialConverter.cpp | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp index 156dc3f551..dd595447ee 100644 --- a/Sources/Tools/MaxConvert/hsMaterialConverter.cpp +++ b/Sources/Tools/MaxConvert/hsMaterialConverter.cpp @@ -135,13 +135,6 @@ namespace { */ } } - - const char sWarnBaseTextureMissing[] = "The object \"%s\"'s material has a base layer that is assigned texture \"%s\", but the texture file is missing. " - "This can cause unwanted effects during runtime."; - const char sWarnUpperTextureMissing[] = "The object \"%s\"'s material has an upper layer that is assigned texture \"%s\", but the texture file is missing. " - "This is not supported in the engine, so the upper layer will be ignored."; - const char sWarnNoUpperTexture[] = "The object \"%s\"'s material has an uppper layer that is not assigned a texture. " - "This is not supported in the engine, so the upper layer will be disabled."; } static uint32_t MakeUInt32Color(float r, float g, float b, float a)