diff options
| author | sanikoyes <sanikoyes@163.com> | 2014-04-06 21:52:47 +0800 |
|---|---|---|
| committer | sanikoyes <sanikoyes@163.com> | 2014-04-06 21:52:47 +0800 |
| commit | 77a840e350668a9c80b1e63b9b73aac44221c53b (patch) | |
| tree | 40d2115e639bdc72a61811ac4f2fb0f04ec8eb7f /core/io/resource_loader.h | |
| parent | 14bbdcb139b35e6d206df1ab3176d34245b72329 (diff) | |
| parent | ded365031ede27b7a6efef59bc886343f58d310b (diff) | |
Merge branch 'master' into hotfix-android-unicode-ime-input
Diffstat (limited to 'core/io/resource_loader.h')
| -rw-r--r-- | core/io/resource_loader.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index 70b1a79582..ab23158785 100644 --- a/core/io/resource_loader.h +++ b/core/io/resource_loader.h @@ -102,6 +102,7 @@ public: static String get_resource_type(const String &p_path); static void get_dependencies(const String& p_path,List<String> *p_dependencies); + static String guess_full_filename(const String &p_path,const String& p_type); static void set_timestamp_on_load(bool p_timestamp) { timestamp_on_load=p_timestamp; } |