From 529945348626f255e5a8665aec4962f43c226ef5 Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Wed, 14 May 2025 15:08:42 +0200 Subject: [PATCH] Fix missing lights when baking a map with vktool --- src/commandlets/lightmapcmd.cpp | 3 +++ src/maploader/maploader.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/commandlets/lightmapcmd.cpp b/src/commandlets/lightmapcmd.cpp index 1fece868b..7e1b476c8 100644 --- a/src/commandlets/lightmapcmd.cpp +++ b/src/commandlets/lightmapcmd.cpp @@ -53,6 +53,9 @@ void LightmapBuildCmdlet::OnCommand(FArgs args) Printf("Lightmap is not enabled in this level.\n"); } + if (level.levelMesh) + level.levelMesh->BeginFrame(level); + Printf("Baking lightmaps. Please wait...\n"); uint32_t atlasPixelCount = level.levelMesh->AtlasPixelCount(); diff --git a/src/maploader/maploader.cpp b/src/maploader/maploader.cpp index 9f09ddd1d..b3126d612 100644 --- a/src/maploader/maploader.cpp +++ b/src/maploader/maploader.cpp @@ -3046,7 +3046,7 @@ bool MapLoader::LoadLightmap(MapData* map) int version = fr.ReadInt32(); if (version < LIGHTMAPVER) { - Printf(PRINT_HIGH, "LoadLightmap: This is an old unsupported version of the lightmap lump. Please rebuild the map with the console commands 'deletelightmap', and then 'savelightmap'.\n"); + Printf(PRINT_HIGH, "LoadLightmap: This is an old unsupported version of the lightmap lump. Please rebuild the map with %s.\n", TOOLNAMELOWERCASE); return false; } else if (version != LIGHTMAPVER)