diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 22:57:24 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 22:57:24 -0300 |
| commit | 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b (patch) | |
| tree | b6d3a290333c72940b49ed4c930ff6858a59515e /core/globals.h | |
| parent | a65edb4caabec21654c56552e11aacf0fd9291de (diff) | |
-fix bug in cache for atlas import/export
-fix some menus
-fixed bug in out transition curves
-detect and remove file:/// in collada
-remove multiscript for now
-remove dependencies on mouse in OS, moved to Input
-avoid fscache from screwing up (fix might make it slower, but it works)
-funcref was missing, it's there now
Diffstat (limited to 'core/globals.h')
| -rw-r--r-- | core/globals.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/globals.h b/core/globals.h index 08d9f08088..b8dc3f9367 100644 --- a/core/globals.h +++ b/core/globals.h @@ -65,9 +65,9 @@ protected: }; int last_order; - HashMap<String,VariantContainer> props; + Map<StringName,VariantContainer> props; String resource_path; - HashMap<String,PropertyInfo> custom_prop_info; + Map<StringName,PropertyInfo> custom_prop_info; bool disable_platform_override; bool using_datapack; |