Merge branch 'master' into 1.5

# Conflicts: # Content/Shaders/GI/DDGI.flax # Content/Shaders/GI/GlobalSurfaceAtlas.flax # Content/Shaders/TAA.flax # Content/Shaders/VolumetricFog.flax # Source/Editor/Utilities/Utils.cs
2022-12-28 16:59:11 +01:00
parent 7859e64db1 3a393b6825
commit 8762e8ad15
54 changed files with 245 additions and 99 deletions
--- a/Source/Engine/Level/Level.cpp
+++ b/Source/Engine/Level/Level.cpp
@@ -176,6 +176,12 @@ bool LevelImpl::spawnActor(Actor* actor, Actor* parent)
        return true;
    }

+    if (actor->GetType().ManagedClass->IsAbstract())
+    {
+        Log::Exception(TEXT("Cannot spawn abstract actor type."));
+        return true;
+    }
+
    if (actor->Is<Scene>())
    {
        // Spawn scene