From b2a31a3bbfe3a51864222e925ab82b38669211cc Mon Sep 17 00:00:00 2001
From: clayjohn <claynjohn@gmail.com>
Date: Tue, 17 Jan 2023 14:33:15 -0800
Subject: [PATCH] Remove light from dynamic light list when removing scenario

---
 servers/rendering/renderer_scene_cull.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/servers/rendering/renderer_scene_cull.cpp b/servers/rendering/renderer_scene_cull.cpp
index 2ea813aab0a0..218bb7b736a9 100644
--- a/servers/rendering/renderer_scene_cull.cpp
+++ b/servers/rendering/renderer_scene_cull.cpp
@@ -748,6 +748,10 @@ void RendererSceneCull::instance_set_scenario(RID p_instance, RID p_scenario) {
 		switch (instance->base_type) {
 			case RS::INSTANCE_LIGHT: {
 				InstanceLightData *light = static_cast<InstanceLightData *>(instance->base_data);
+				if (instance->visible && RSG::light_storage->light_get_type(instance->base) != RS::LIGHT_DIRECTIONAL && light->bake_mode == RS::LIGHT_BAKE_DYNAMIC) {
+					instance->scenario->dynamic_lights.erase(light->instance);
+				}
+
 #ifdef DEBUG_ENABLED
 				if (light->geometries.size()) {
 					ERR_PRINT("BUG, indexing did not unpair geometries from light.");