diff --git a/neo/renderer/Image_load.cpp b/neo/renderer/Image_load.cpp index 56f49946..309ceebc 100644 --- a/neo/renderer/Image_load.cpp +++ b/neo/renderer/Image_load.cpp @@ -513,8 +513,6 @@ void idImage::ActuallyLoadImage( bool fromBackEnd ) idLib::Warning( "Couldn't load image: %s : %s", GetName(), generatedName.c_str() ); // create a default so it doesn't get continuously reloaded - defaulted = true; // RB - opts.width = 8; opts.height = 8; opts.numLevels = 1; @@ -529,6 +527,7 @@ void idImage::ActuallyLoadImage( bool fromBackEnd ) SubImageUpload( level, 0, 0, 0, opts.width >> level, opts.height >> level, clear.Ptr() ); } + defaulted = true; // RB return; } diff --git a/neo/renderer/OpenGL/Image_GL.cpp b/neo/renderer/OpenGL/Image_GL.cpp index ac447078..b8cfc9ef 100644 --- a/neo/renderer/OpenGL/Image_GL.cpp +++ b/neo/renderer/OpenGL/Image_GL.cpp @@ -881,6 +881,9 @@ void idImage::PurgeImage() glcontext.tmu[i].current2DArray = TEXTURE_NOT_LOADED; glcontext.tmu[i].currentCubeMap = TEXTURE_NOT_LOADED; } + + // reset for reloading images + defaulted = false; } /* diff --git a/neo/renderer/RenderWorld_envprobes.cpp b/neo/renderer/RenderWorld_envprobes.cpp index 5192a709..76fabde0 100644 --- a/neo/renderer/RenderWorld_envprobes.cpp +++ b/neo/renderer/RenderWorld_envprobes.cpp @@ -1142,8 +1142,8 @@ CONSOLE_COMMAND( bakeEnvironmentProbes, "Bake environment probes", NULL ) continue; } - def->irradianceImage->Reload( false ); - def->radianceImage->Reload( false ); + def->irradianceImage->Reload( true ); + def->radianceImage->Reload( true ); } idLib::Printf( "----------------------------------\n" ); diff --git a/neo/renderer/RenderWorld_lightgrid.cpp b/neo/renderer/RenderWorld_lightgrid.cpp index a025a63b..239cf94a 100644 --- a/neo/renderer/RenderWorld_lightgrid.cpp +++ b/neo/renderer/RenderWorld_lightgrid.cpp @@ -421,7 +421,7 @@ void idRenderWorldLocal::LoadLightGridImages() } else { - area->lightGrid.irradianceImage->Reload( false ); + area->lightGrid.irradianceImage->Reload( true ); } } } @@ -1029,18 +1029,6 @@ CONSOLE_COMMAND( bakeLightGrids, "Bake irradiance/vis light grid data", NULL ) int blends; int captureSize; - if( !tr.primaryWorld ) - { - idLib::Printf( "No primary world loaded.\n" ); - return; - } - - if( !tr.primaryView ) - { - idLib::Printf( "No primary view.\n" ); - return; - } - int limit = MAX_AREA_LIGHTGRID_POINTS; int bounces = 1; idVec3 gridSize = defaultLightGridSize; @@ -1102,6 +1090,18 @@ CONSOLE_COMMAND( bakeLightGrids, "Bake irradiance/vis light grid data", NULL ) return; } + if( !tr.primaryWorld ) + { + idLib::Printf( "No primary world loaded.\n" ); + return; + } + + if( !tr.primaryView ) + { + idLib::Printf( "No primary view.\n" ); + return; + } + int sysWidth = renderSystem->GetWidth(); int sysHeight = renderSystem->GetHeight();