Merge remote-tracking branch 'origin/master' into 1.6

2023-05-05 11:41:32 +02:00
parent 238526bdc4 de1ba2de6f
commit 22239bc2d1
15 changed files with 96 additions and 16 deletions
--- a/Source/Engine/Level/Actor.h
+++ b/Source/Engine/Level/Actor.h
@@ -379,7 +379,7 @@ public:
    }

    /// <summary>
-    /// Gets the actor static fags.
+    /// Gets the actor static flags.
    /// </summary>
    API_PROPERTY(Attributes="NoAnimate, EditorDisplay(\"General\"), EditorOrder(-80), CustomEditorAlias(\"FlaxEditor.CustomEditors.Editors.ActorStaticFlagsEditor\")")
    FORCE_INLINE StaticFlags GetStaticFlags() const
--- a/Source/Engine/Level/Types.h
+++ b/Source/Engine/Level/Types.h
@@ -98,7 +98,7 @@ API_ENUM(Attributes="Flags") enum class StaticFlags
    Navigation = 1 << 3,

    /// <summary>
-    /// Objects is fully static on the scene.
+    /// Object is fully static in the scene.
    /// </summary>
    FullyStatic = Transform | ReflectionProbe | Lightmap | Navigation,