diff options
author | Juan Linietsky <reduzio@gmail.com> | 2016-05-27 14:18:40 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-27 14:19:11 -0300 |
commit | 8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da (patch) | |
tree | a3e932282cdafdd13c4f02bdf21f72f9846adcbe /core/resource.cpp | |
parent | eb7227a20b27e91c6e2adfb1ded738f2dd7e453b (diff) | |
download | redot-engine-8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da.tar.gz |
Changed import workflow
-Rearrange favorites in fs dock with drag and drop
-Removed import -> sub-scene, moved to scenetree contextual menu
-Removed import -> re-import , moved and integrated to FS dock
-Added ability in FS dock to re-import more than one resource
simultaneously
-Added ability to drag from native filesystem explorer to Godot, only
works on Windows though
-Removed scene reimport merge options, never worked well. Eventually
merging materials should be re-added
-Added ability to set custom root node type when importing scenes
-Re-Import is now automatic, can be configured back to manual in editor
settings
-Added resource previews in property list for many resource types
Diffstat (limited to 'core/resource.cpp')
-rw-r--r-- | core/resource.cpp | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/core/resource.cpp b/core/resource.cpp index 672e64b1bb..b7a5bad4b8 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -330,6 +330,31 @@ Ref<ResourceImportMetadata> Resource::get_import_metadata() const { } +#ifdef TOOLS_ENABLED + +uint32_t Resource::hash_edited_version() const { + + uint32_t hash = hash_djb2_one_32(get_edited_version()); + + List<PropertyInfo> plist; + get_property_list(&plist); + + for (List<PropertyInfo>::Element *E=plist.front();E;E=E->next()) { + + if (E->get().type==Variant::OBJECT && E->get().hint==PROPERTY_HINT_RESOURCE_TYPE) { + RES res = get(E->get().name); + if (res.is_valid()) { + hash = hash_djb2_one_32(res->hash_edited_version(),hash); + } + } + } + + return hash; + +} + +#endif + Resource::Resource() { @@ -341,6 +366,8 @@ Resource::Resource() { } + + Resource::~Resource() { if (path_cache!="") |