diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-09 17:51:14 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-09 17:51:14 +0300 |
| commit | ff755f93eb86e3f7f6801918457ca77a3001671b (patch) | |
| tree | 58d6def002b427db665a504f08d25eae335bd9d9 /modules/gdscript/gd_script.h | |
| parent | d45be7d9f43046365fcfbf97420f9eca636c51e7 (diff) | |
| parent | be4e40e90a5a322f6a7cec4893854ef5b15db600 (diff) | |
Merge branch 'master' of http://github.com/okamstudio/godot
Diffstat (limited to 'modules/gdscript/gd_script.h')
| -rw-r--r-- | modules/gdscript/gd_script.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h index 3b183a41b6..f4e4dffaa5 100644 --- a/modules/gdscript/gd_script.h +++ b/modules/gdscript/gd_script.h @@ -245,7 +245,16 @@ friend class GDScriptLanguage; Map<StringName,Ref<GDScript> > subclasses; #ifdef TOOLS_ENABLED + Map<StringName,Variant> member_default_values; + + List<PropertyInfo> members_cache; + Map<StringName,Variant> member_default_values_cache; + Ref<GDScript> base_cache; + Set<ObjectID> inheriters_cache; + bool source_changed_cache; + void _update_exports_values(Map<StringName,Variant>& values, List<PropertyInfo> &propnames); + #endif Map<StringName,PropertyInfo> member_info; @@ -265,13 +274,13 @@ friend class GDScriptLanguage; #ifdef TOOLS_ENABLED Set<PlaceHolderScriptInstance*> placeholders; - void _update_placeholder(PlaceHolderScriptInstance *p_placeholder); + //void _update_placeholder(PlaceHolderScriptInstance *p_placeholder); virtual void _placeholder_erased(PlaceHolderScriptInstance *p_placeholder); #endif - void _update_exports(Set<PlaceHolderScriptInstance *> *p_instances); + bool _update_exports(); protected: bool _get(const StringName& p_name,Variant &r_ret) const; |