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/Editor/Cooker/GameCooker.cpp
+++ b/Source/Editor/Cooker/GameCooker.cpp
@@ -171,7 +171,7 @@ CookingData::Statistics::Statistics()
 }

 CookingData::CookingData(const SpawnParams& params)
-    : PersistentScriptingObject(params)
+    : ScriptingObject(params)
 {
 }