Merge branch 'master' into mac

2022-01-09 19:15:15 +01:00
parent 38b6b546c7 729bfcb941
commit c4b6865659
94 changed files with 1726 additions and 499 deletions
--- a/Source/Engine/Platform/Base/PlatformBase.cpp
+++ b/Source/Engine/Platform/Base/PlatformBase.cpp
@@ -112,7 +112,7 @@ UserBase::UserBase(const String& name)
 }

 UserBase::UserBase(const SpawnParams& params, const String& name)
-    : PersistentScriptingObject(params)
+    : ScriptingObject(params)
    , _name(name)
 {
 }