From 447d11b1eedf59c56ea08bc369bb082381aae1db Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Thu, 20 May 2021 08:10:50 +0200 Subject: [PATCH] Run astyle --- neo/framework/common_frame.cpp | 2 +- neo/renderer/Model.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/neo/framework/common_frame.cpp b/neo/framework/common_frame.cpp index da38afde..65d3223e 100644 --- a/neo/framework/common_frame.cpp +++ b/neo/framework/common_frame.cpp @@ -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 diff --git a/neo/renderer/Model.cpp b/neo/renderer/Model.cpp index 3a78daf3..41b31f22 100644 --- a/neo/renderer/Model.cpp +++ b/neo/renderer/Model.cpp @@ -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;