diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2018-10-04 23:00:02 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2018-10-05 19:00:32 -0300 |
| commit | f12cb82e0f7b3348ab678322cf5e729b38861f1e (patch) | |
| tree | ab9ccc69df906b8591e3f0b91c25266393304144 /core/io | |
| parent | a41cf404a9013db6aed56d6ed9b051c2a4948bff (diff) | |
Fixes to baker, restored xatlas and fixed bake options.
Diffstat (limited to 'core/io')
| -rw-r--r-- | core/io/resource_loader.cpp | 2 | ||||
| -rw-r--r-- | core/io/resource_loader.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 8c56d55e85..d156a9f4bd 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -647,3 +647,5 @@ bool ResourceLoader::timestamp_on_load = false; SelfList<Resource>::List ResourceLoader::remapped_list; HashMap<String, Vector<String> > ResourceLoader::translation_remaps; HashMap<String, String> ResourceLoader::path_remaps; + +ResourceLoaderImport ResourceLoader::import = NULL; diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index de0981350d..96bc6fa8dd 100644 --- a/core/io/resource_loader.h +++ b/core/io/resource_loader.h @@ -77,6 +77,8 @@ public: typedef void (*ResourceLoadErrorNotify)(void *p_ud, const String &p_text); typedef void (*DependencyErrorNotify)(void *p_ud, const String &p_loading, const String &p_which, const String &p_type); +typedef Error (*ResourceLoaderImport)(const String &p_path); + class ResourceLoader { enum { @@ -147,6 +149,8 @@ public: static void reload_translation_remaps(); static void load_translation_remaps(); static void clear_translation_remaps(); + + static ResourceLoaderImport import; }; #endif |