From 4357e0f7a3f445d46f465a175af257a9daab5517 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Wed, 1 May 2024 11:37:34 +0200 Subject: [PATCH] Restored internal envprobe fallback if map has no envprobes. close #836 --- neo/renderer/Image_load.cpp | 3 +++ neo/renderer/tr_frontend_main.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/neo/renderer/Image_load.cpp b/neo/renderer/Image_load.cpp index 7bd3b55b..8080a80d 100644 --- a/neo/renderer/Image_load.cpp +++ b/neo/renderer/Image_load.cpp @@ -585,6 +585,9 @@ void idImage::FinalizeImage( bool fromBackEnd, nvrhi::ICommandList* commandList AllocImage(); + // default it again because it was unset by AllocImage().PurgeImage() + defaulted = true; + // clear the data so it's not left uninitialized idTempArray clear( opts.width * opts.height * 4 ); memset( clear.Ptr(), 0, clear.Size() ); diff --git a/neo/renderer/tr_frontend_main.cpp b/neo/renderer/tr_frontend_main.cpp index 4c63975b..cc7e98af 100644 --- a/neo/renderer/tr_frontend_main.cpp +++ b/neo/renderer/tr_frontend_main.cpp @@ -532,7 +532,7 @@ static void R_FindClosestEnvironmentProbes() RenderEnvprobeLocal* nearest = viewEnvprobes[0]; tr.viewDef->globalProbeBounds = nearest->globalProbeBounds; - if( !nearest->irradianceImage->IsDefaulted() ) + if( nearest->irradianceImage->IsLoaded() && !nearest->irradianceImage->IsDefaulted() ) { tr.viewDef->irradianceImage = nearest->irradianceImage; }