From c85ee9ff52352b6749e636d8ad537552d14da10a Mon Sep 17 00:00:00 2001
From: Wojciech Figat <wojtek@figat.pl>
Date: Fri, 18 Mar 2022 13:28:50 +0100
Subject: [PATCH] Fix key clearing on actor remove from `SceneRendering`

---
 Source/Engine/Level/Scene/SceneRendering.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/Engine/Level/Scene/SceneRendering.cpp b/Source/Engine/Level/Scene/SceneRendering.cpp
index 51dea146b..72acf14e9 100644
--- a/Source/Engine/Level/Scene/SceneRendering.cpp
+++ b/Source/Engine/Level/Scene/SceneRendering.cpp
@@ -115,11 +115,12 @@ void SceneRendering::UpdateActor(Actor* a, int32 key)
 
 void SceneRendering::RemoveActor(Actor* a, int32& key)
 {
-    if (Actors.IsEmpty())
-        return;
-    auto& e = Actors[key];
-    ASSERT_LOW_LAYER(a == e.Actor);
-    e.Actor = nullptr;
-    e.LayerMask = 0;
+    if (Actors.HasItems())
+    {
+        auto& e = Actors[key];
+        ASSERT_LOW_LAYER(a == e.Actor);
+        e.Actor = nullptr;
+        e.LayerMask = 0;
+    }
     key = -1;
 }