godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Mono: Fix hot reload build errors and cleanup

Browse Source
This commit is contained in:
Ignacio Etcheverry
2019-01-22 18:33:36 +01:00
parent 077e489773
commit bc8b61bb06
6 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/mono/csharp_script.h
View File

@@ -82,10 +82,7 @@ class CSharpScript : public Script {
Set<Object *> instances;
#ifdef DEBUG_ENABLED
Set<ObjectID> pending_reload_instances;
#endif
#ifdef GD_MONO_HOT_RELOAD
struct StateBackup {
// TODO
// Replace with buffer containing the serialized state of managed scripts.
@@ -93,8 +90,8 @@ class CSharpScript : public Script {
List<Pair<StringName, Variant> > properties;
};
#ifdef TOOLS_ENABLED
Map<ObjectID, CSharpScript::StateBackup> pending_reload_state;
Set<ObjectID> pending_reload_instances;
Map<ObjectID, StateBackup> pending_reload_state;
#endif
String source;
@@ -313,7 +310,7 @@ public:
bool debug_break(const String &p_error, bool p_allow_continue = true);
bool debug_break_parse(const String &p_file, int p_line, const String &p_error);
#ifdef TOOLS_ENABLED
#ifdef GD_MONO_HOT_RELOAD
bool is_assembly_reloading_needed();
void reload_assemblies(bool p_soft_reload);
#endif