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

Source/Engine/Content/Assets/Animation.cpp

@@ -6,6 +6,7 @@
 #include "Engine/Content/Factories/BinaryAssetFactory.h"
 #include "Engine/Animations/CurveSerialization.h"
 #include "Engine/Animations/AnimEvent.h"
+#include "Engine/Animations/Animations.h"
 #include "Engine/Animations/SceneAnimations/SceneAnimation.h"
 #include "Engine/Scripting/Scripting.h"
 #include "Engine/Threading/Threading.h"
@@ -597,6 +598,8 @@ void Animation::OnScriptingDispose()
 
 Asset::LoadResult Animation::load()
 {
+    ConcurrentSystemLocker::WriteScope systemScope(Animations::SystemLocker);
+
     // Get stream with animations data
     const auto dataChunk = GetChunk(0);
     if (dataChunk == nullptr)
@@ -727,6 +730,7 @@ Asset::LoadResult Animation::load()
 
 void Animation::unload(bool isReloading)
 {
+    ConcurrentSystemLocker::WriteScope systemScope(Animations::SystemLocker);
 #if USE_EDITOR
     if (_registeredForScriptingReload)
     {