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

# Conflicts:
#	.github/workflows/tests.yml
#	Source/Engine/Content/JsonAsset.cs
This commit is contained in:
Wojtek Figat
2023-05-07 19:46:29 +02:00
31 changed files with 603 additions and 311 deletions

View File

@@ -251,3 +251,5 @@ API_CLASS(InBuild) class FLAXENGINE_API PersistentScriptingObject : public Scrip
public:
PersistentScriptingObject(const SpawnParams& params);
};
extern FLAXENGINE_API class ScriptingObject* FindObject(const Guid& id, class MClass* type);