Merge branch '1.5' into dotnet7

# Conflicts: # Content/Shaders/GI/DDGI.flax # Content/Shaders/GI/GlobalSurfaceAtlas.flax # Content/Shaders/TAA.flax # Content/Shaders/VolumetricFog.flax # Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
2023-01-17 11:52:52 +01:00
parent abdc257332 fc65e5a7a6
commit 7b20bc38a4
134 changed files with 1895 additions and 621 deletions
--- a/Source/Engine/Scripting/ScriptingObject.h
+++ b/Source/Engine/Scripting/ScriptingObject.h
@@ -206,7 +206,7 @@ public:
    /// </summary>
    FORCE_INLINE bool IsRegistered() const
    {
-        return (Flags & ObjectFlags::IsRegistered) != 0;
+        return (Flags & ObjectFlags::IsRegistered) != ObjectFlags::None;
    }

    /// <summary>