summaryrefslogtreecommitdiffstats
path: root/modules/gdscript/gd_script.h
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-07-20 22:37:48 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-07-20 22:37:48 -0300
commit33cc480350264e15c12bf82b9198b9967e4313dc (patch)
treea2405e70104117aa52402f5d4dd98e1e2cf047d7 /modules/gdscript/gd_script.h
parent79a7473cac40049769121a3a619b0d1e08899353 (diff)
downloadredot-engine-33cc480350264e15c12bf82b9198b9967e4313dc.tar.gz
Fixed reloading of tool scripts within editor, they should work much better now, closes #3194
Diffstat (limited to 'modules/gdscript/gd_script.h')
-rw-r--r--modules/gdscript/gd_script.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h
index 723761c3a9..f0b6b7103c 100644
--- a/modules/gdscript/gd_script.h
+++ b/modules/gdscript/gd_script.h
@@ -120,7 +120,11 @@ friend class GDScriptLanguage;
virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder);
#endif
+#ifdef DEBUG_ENABLED
+
+ Map<ObjectID,List<Pair<StringName,Variant> > > pending_reload_state;
+#endif
bool _update_exports();
@@ -265,6 +269,8 @@ class GDScriptLanguage : public ScriptLanguage {
Mutex *lock;
+
+
friend class GDScript;
SelfList<GDScript>::List script_list;