Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix hsMaterialConverter format stuff. #1481

Merged
merged 2 commits into from
Sep 7, 2023
Merged

Fix hsMaterialConverter format stuff. #1481

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2caaddb
Fix incorrect format specifier.
Hoikas Sep 7, 2023
3c22b1e
Fix potential ODR violation.
Hoikas Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions Sources/Tools/MaxConvert/hsMaterialConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -1607,7 +1600,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"
Expand Down