1 files changed, 42 insertions, 3 deletions

diff --git a/src/world.cpp b/src/world.cpp
index ea186b4..a0576ab 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -633,6 +633,10 @@ bool load_png_rgba(const char *path, std::vector<unsigned char> &pixels,
 }
 
 std::vector<unsigned char> g_sky_pixels;
+// Pristine copy of the decoded PNG. HDR compensation is applied to
+// g_sky_pixels in place, so without this the linearised/darkened bytes bled
+// into the next map when it used the LDR sky shader.
+std::vector<unsigned char> g_sky_pixels_src;
 int g_sky_px_w = 0, g_sky_px_h = 0;
 
 // ITextureRegenerator has two virtuals: RegenerateTextureBits then Release.
@@ -717,6 +721,28 @@ bool is_sky_material(const char *name, const char *group) {
          strncmp(name, "skybox/", 7) == 0;
 }
 
+// ITexture reference counting (material system header order, matching the
+// slots already used here: SetTextureRegenerator = 12, Download = 13):
+//  10 = IncrementReferenceCount, 11 = DecrementReferenceCount
+// The engine owns the original textures; holding a reference keeps them valid
+// between "capture" and "restore" instead of leaving a dangling pointer.
+static void texture_addref(void *tex) {
+  if (!tex)
+    return;
+  using Fn = void (*)(void *);
+  vfunc<Fn>(tex, 10)(tex);
+}
+
+void release_sky_originals() {
+  for (auto &r : g_sky_orig) {
+    if (!r.texture)
+      continue;
+    using Fn = void (*)(void *);
+    vfunc<Fn>(r.texture, 11)(r.texture);
+  }
+  g_sky_orig.clear();
+}
+
 void record_orig(const char *material, const char *var, const char *value,
                  void *texture) {
   if (!material || !var)
@@ -725,6 +751,7 @@ void record_orig(const char *material, const char *var, const char *value,
     if (r.material == material && r.var == var)
       return;
   }
+  texture_addref(texture);
   g_sky_orig.push_back(
       {material, var, value ? value : "", texture});
 }
@@ -750,6 +777,10 @@ int apply_sky_texture() {
   // where the materials are definitely loaded, and re-upload if needed.
   bool hdr = sky_uses_hdr_shader();
   if (hdr && !g_sky_compensated && !g_sky_pixels.empty()) {
+    // Always start from the untouched decode so repeated HDR passes cannot
+    // compound the gamma conversion.
+    if (!g_sky_pixels_src.empty())
+      g_sky_pixels = g_sky_pixels_src;
     for (size_t i = 0; i + 3 < g_sky_pixels.size(); i += 4) {
       for (int c = 0; c < 3; c++) {
         float v = (float)g_sky_pixels[i + (size_t)c] / 255.0f;
@@ -822,7 +853,7 @@ void restore_sky_texture() {
   }
   void *ms = material_system();
   if (!ms) {
-    g_sky_orig.clear();
+    release_sky_originals();
     g_sky_applied = false;
     return;
   }
@@ -833,7 +864,7 @@ void restore_sky_texture() {
   auto count = vfunc<MatCalls::CountFn>(ms, MATSYS_GetNumMaterials);
   int total = count(ms);
   if (total <= 0 || total > 200000) {
-    g_sky_orig.clear();
+    release_sky_originals();
     g_sky_applied = false;
     return;
   }
@@ -866,7 +897,7 @@ void restore_sky_texture() {
         vfunc<SetStrFn>(var, 5)(var, r.value.c_str());
     }
   }
-  g_sky_orig.clear();
+  release_sky_originals();
   g_sky_applied = false;
 }
 
@@ -925,6 +956,7 @@ void load_sky_texture() {
     return;
   }
   g_sky_pixels.swap(pixels);
+  g_sky_pixels_src = g_sky_pixels;
   g_sky_px_w = w;
   g_sky_px_h = h;
 
@@ -960,6 +992,13 @@ void skybox_invalidate() {
 
 void skybox_reload_image() {
   restore_sky_texture();
+  // Detach the regenerator before dropping the handle: the old texture may
+  // outlive it and must not call back into a regenerator whose pixels were
+  // replaced.
+  if (g_sky_tex) {
+    using SetRegenFn = void (*)(void *, void *);
+    vfunc<SetRegenFn>(g_sky_tex, 12)(g_sky_tex, nullptr);
+  }
   g_sky_tex = nullptr;
   g_sky_tex_tried = false;
   g_sky_reload = true;