Fix not saving file on resolving

Mag1str02 · Jan 13, 2025 · e782758 · e782758
1 parent 45d88d6
commit e782758
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/DummyEngine/Core/Scene/SceneRenderer.cpp b/DummyEngine/Core/Scene/SceneRenderer.cpp
@@ -297,13 +297,8 @@ namespace DummyEngine {
         Console::OnCommand("r_shadowmap_resize", [&]() {
             LOG_INFO("ShadowMap resize");
             shadow_map_->Resize(static_cast<U32>(Console::GetInt("r_shadowmap_width")), static_cast<U32>(Console::GetInt("r_shadowmap_height")));
-<<<<<<< HEAD
             point_shadow_cubemaps_.clear();
             point_shadow_map_.clear();
-=======
-            point_shadow_map_.clear();
-            point_shadow_cubemaps_.clear();
->>>>>>> 07c8431 (Add GCC support + force use X11 instead of Wayland)
         });
     }
 }  // namespace DummyEngine