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/Actor.h
+++ b/Source/Engine/Level/Actor.h
@@ -207,6 +207,9 @@ public:
        T* result = (T*)GetChild(T::GetStaticClass());
        if (!result)
        {
+            if (T::GetStaticClass()->IsAbstract())
+                return nullptr;
+
            result = New<T>();
            result->SetParent(this, false, false);
        }