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 /tools/editor/scene_tree_dock.h | |
| parent | eb7227a20b27e91c6e2adfb1ded738f2dd7e453b (diff) | |
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 'tools/editor/scene_tree_dock.h')
| -rw-r--r-- | tools/editor/scene_tree_dock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/editor/scene_tree_dock.h b/tools/editor/scene_tree_dock.h index 0894dc8ffa..a5866944f3 100644 --- a/tools/editor/scene_tree_dock.h +++ b/tools/editor/scene_tree_dock.h @@ -64,6 +64,7 @@ class SceneTreeDock : public VBoxContainer { TOOL_DUPLICATE, TOOL_REPARENT, TOOL_NEW_SCENE_FROM, + TOOL_MERGE_FROM_SCENE, TOOL_MULTI_EDIT, TOOL_ERASE, TOOL_BUTTON_MAX |