From 8be2fabbe5cd846bac5e5a38e55f3fb70e73f2da Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Fri, 27 May 2016 14:18:40 -0300 Subject: 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 --- core/io/resource_loader.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'core/io') diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index abb1082256..b547dc0e85 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -243,6 +243,7 @@ Ref ResourceLoader::load_import_metadata(const String &p break; } + return ret; } -- cgit v1.2.3