GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Reduce compilation problems by moving FindObject fwd decl to be more commonly included

Browse Source 
#1040
This commit is contained in:
Wojtek Figat
2023-05-05 16:10:09 +02:00
parent e93eb6aae6
commit 5d2a3482c7
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Scripting/ScriptingObject.h
View File

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

2
Source/Engine/Serialization/ReadStream.h
View File

@@ -5,8 +5,6 @@
#include "Stream.h" #include "Stream.h"
#include "Engine/Core/Templates.h" #include "Engine/Core/Templates.h"
extern FLAXENGINE_API class ScriptingObject* FindObject(const Guid& id, class MClass* type);
/// <summary> /// <summary>
/// Base class for all data read streams /// Base class for all data read streams
/// </summary> /// </summary>

2
Source/Engine/Serialization/Serialization.h
View File

@@ -456,7 +456,7 @@ namespace Serialization
Guid id; Guid id;
Deserialize(stream, id, modifier); Deserialize(stream, id, modifier);
modifier->IdsMapping.TryGet(id, id); modifier->IdsMapping.TryGet(id, id);
v = (T*)FindObject(id, T::GetStaticClass()); v = (T*)::FindObject(id, T::GetStaticClass());
} }
// Scripting Object Reference // Scripting Object Reference