From 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 13 Mar 2014 22:57:24 -0300 Subject: -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 --- core/globals.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/globals.h') 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 props; + Map props; String resource_path; - HashMap custom_prop_info; + Map custom_prop_info; bool disable_platform_override; bool using_datapack; -- cgit v1.2.3