Merge branch 'master' into 1.1

# Conflicts: # Source/Engine/Content/JsonAsset.h # Source/Engine/Core/Config/Settings.h
2021-02-15 10:40:59 +01:00
parent bd5897eaab 2357b60d0e
commit 312e4ad010
77 changed files with 1111 additions and 531 deletions
--- a/Source/Engine/Core/Math/Vector3.cs
+++ b/Source/Engine/Core/Math/Vector3.cs
@@ -1221,7 +1221,7 @@ namespace FlaxEngine
            float dot = Mathf.Clamp(Dot(from.Normalized, to.Normalized), -1F, 1F);
            if (Mathf.Abs(dot) > (1F - Mathf.Epsilon))
                return dot > 0F ? 0F : 180F;
-            return Mathf.Acos(dot) * Mathf.DegreesToRadians;
+            return Mathf.Acos(dot) * Mathf.RadiansToDegrees;
        }

        /// <summary>