Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Some more material system clean-up #1563

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

Merged
VReaperV merged 3 commits into from
Mar 3, 2025
Merged

Some more material system clean-up #1563

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
300f36b
Some material system clean-up
VReaperV Feb 23, 2025
8dd09a3
Move material system stuff from common_cp to material_cp
VReaperV Feb 23, 2025
e40b874
Fix crash due to MST_FLARE usage
VReaperV Mar 2, 2025
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
Prev Previous commit
Fix crash due to MST_FLARE usage
  • Loading branch information
@VReaperV
VReaperV committed Mar 2, 2025
commit e40b87425128d78340912f328577d3afebef9a87
6 changes: 6 additions & 0 deletions src/engine/renderer/tr_bsp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3440,6 +3440,12 @@ static void R_LoadSurfaces( lump_t *surfs, lump_t *verts, lump_t *indexLump )
case mapSurfaceType_t::MST_FLARE:
Log::Warn( "Surface type not supported: MST_FLARE; firstIndex: %i, numIndexes: %i, shaderNum: %i",
in->firstIndex, in->numIndexes, in->shaderNum );

// We still have to set these because other code will be checking them
out->data = ( surfaceType_t* ) ri.Hunk_Alloc( sizeof( surfaceType_t ), ha_pref::h_low );
*out->data = surfaceType_t::SF_BAD;
out->shader = tr.defaultShader;

numFlares++;
break;

Expand Down