Merge branch 'master' into master

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

Source/Engine/Level/Level.cpp

@@ -903,12 +903,11 @@ bool LevelImpl::unloadScene(Scene* scene)
 bool LevelImpl::unloadScenes()
 {
     auto scenes = Level::Scenes;
-    for (int32 i = 0; i < scenes.Count(); i++)
+    for (int32 i = scenes.Count() - 1; i >= 0; i--)
     {
         if (unloadScene(scenes[i]))
             return true;
     }
-
     return false;
 }
 
@@ -1210,6 +1209,15 @@ bool LevelImpl::saveScene(Scene* scene, const String& path)
 
     LOG(Info, "Scene saved! Time {0} ms", Math::CeilToInt((float)(DateTime::NowUTC() - startTime).GetTotalMilliseconds()));
 
+#if USE_EDITOR
+    // Reload asset at the target location if is loaded
+    Asset* asset = Content::GetAsset(sceneId);
+    if (!asset)
+        asset = Content::GetAsset(path);
+    if (asset)
+        asset->Reload();
+#endif
+
     // Fire event
     CallSceneEvent(SceneEventType::OnSceneSaved, scene, sceneId);
 

Source/Engine/Level/Tags.cpp

@@ -73,7 +73,7 @@ Array<Tag> Tags::GetSubTags(Tag parentTag)
     return subTags;
 }
 
-bool Tags::HasTag(const Array<Tag>& list, const Tag& tag)
+bool Tags::HasTag(const Array<Tag>& list, const Tag tag)
 {
     if (tag.Index == 0)
         return false;
@@ -87,7 +87,7 @@ bool Tags::HasTag(const Array<Tag>& list, const Tag& tag)
     return false;
 }
 
-bool Tags::HasTagExact(const Array<Tag>& list, const Tag& tag)
+bool Tags::HasTagExact(const Array<Tag>& list, const Tag tag)
 {
     if (tag.Index == 0)
         return false;

Source/Engine/Level/Tags.h

@@ -106,7 +106,7 @@ public:
     /// <param name="list">The tags list to use.</param>
     /// <param name="tag">The tag to check.</param>
     /// <returns>True if given tag is contained by the list of tags. Returns false for empty list.</returns>
-    static bool HasTag(const Array<Tag>& list, const Tag& tag);
+    static bool HasTag(const Array<Tag>& list, const Tag tag);
 
     /// <summary>
     /// Checks if the list of tags contains a given tag (exact match). For example, HasTag({"A.B"}, "A") returns false, for parents check use HasTag.
@@ -114,7 +114,7 @@ public:
     /// <param name="list">The tags list to use.</param>
     /// <param name="tag">The tag to check.</param>
     /// <returns>True if given tag is contained by the list of tags. Returns false for empty list.</returns>
-    static bool HasTagExact(const Array<Tag>& list, const Tag& tag);
+    static bool HasTagExact(const Array<Tag>& list, const Tag tag);
 
     /// <summary>
     /// Checks if the list of tags contains any of the given tags (including parent tags check). For example, HasAny({"A.B", "C"}, {"A"}) returns true, for exact check use HasAnyExact.

Source/Engine/Level/Types.h

@@ -100,7 +100,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,