id/doom3-bfg
0
0
Fork 0
mirror of https://github.com/id-Software/DOOM-3-BFG.git synced 2025-03-15 07:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Run astyle

Browse source
This commit is contained in:
Robert Beckebans 2021-05-20 08:10:50 +02:00
parent f7c1ab7bfb
commit 447d11b1ee
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/framework/common_frame.cpp
View file

@ -871,7 +871,7 @@ void idCommonLocal::Frame()
gameReturn_t ret = gameThread.RunGameAndDraw( numGameFrames, userCmdMgr, IsClient(), gameFrame - numGameFrames );
// foresthale 2014-05-12: also check com_editors as many of them are not particularly thread-safe (editLights for example)
// SRS - if com_editors is active make sure com_smp != -1, otherwise skip and call SwapCommandBuffers_FinishRendering later
// SRS - if com_editors is active make sure com_smp != -1, otherwise skip and call SwapCommandBuffers_FinishRendering later
if( com_smp.GetInteger() == 0 || ( com_smp.GetInteger() > 0 && com_editors != 0 ) )
{
// in non-smp mode, run the commands we just generated, instead of

6
neo/renderer/Model.cpp
View file

@ -2274,10 +2274,10 @@ bool idRenderModelStatic::ConvertASEToModelSurfaces( const struct aseModel_s* as
mesh = &object->mesh;
//material = ase->materials[object->materialRef];
//im1 = declManager->FindMaterial( material->name );
//
//
// caedes dhewm3 fix for ASE meshes without materials (a lot of Doom 3 mods have this issue) 05-18-2021
material = (ase->materials.Num() > object->materialRef) ? ase->materials[object->materialRef] : NULL;
im1 = declManager->FindMaterial(material ? material->name : NULL);
material = ( ase->materials.Num() > object->materialRef ) ? ase->materials[object->materialRef] : NULL;
im1 = declManager->FindMaterial( material ? material->name : NULL );
bool normalsParsed = mesh->normalsParsed;