olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

decompile: fix texture name crash with missing texinfo

This commit is contained in:
Eric Wasylishen 2022-06-05 23:42:44 -06:00
parent fe31e1c1ce
commit c2b39a6502
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bsputil/decompile.cpp
View File

@ -860,7 +860,7 @@ static compiled_brush_t DecompileLeafTask(
side.valve = finalSide.plane.normal;
DefaultSkipSide(side, bsp);
} else {
const char *name;
const char *name = nullptr;
const gtexinfo_t *ti;
auto faces = finalSide.faces;
@ -871,10 +871,12 @@ static compiled_brush_t DecompileLeafTask(
ti = Face_Texinfo(bsp, face);
} else if (finalSide.plane.source) {
ti = BSP_GetTexinfo(bsp, finalSide.plane.source->texinfo);
name = ti->texture.data();
if (ti) {
name = ti->texture.data();
}
}
if (!name && !*name) {
if (!name || !name[0]) {
DefaultSkipSide(side, bsp);
} else {
OverrideTextureForContents(side, bsp, name, brush.contents);