summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authordankan1890 <mewuidev2@gmail.com>2021-01-12 00:51:59 +0100
committerdankan1890 <mewuidev2@gmail.com>2021-01-12 00:51:59 +0100
commit390ff22a8cd9292d1a7ca3383b14eef4e48712b7 (patch)
tree9c5b9f2e559a845ed74e1aa51b7ca155a4efdce4 /editor
parent8e514bbf6ab3d2cff4daeb64e842bd8846c07046 (diff)
Create spritesheet for SpriteFrames by drag and dropping.
Close godotengine/godot-proposals#378
Diffstat (limited to 'editor')
-rw-r--r--editor/plugins/sprite_frames_editor_plugin.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp
index 2aa6ad0eaa..0547f99079 100644
--- a/editor/plugins/sprite_frames_editor_plugin.cpp
+++ b/editor/plugins/sprite_frames_editor_plugin.cpp
@@ -32,6 +32,7 @@
#include "core/config/project_settings.h"
#include "core/io/resource_loader.h"
+#include "core/os/keyboard.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h"
#include "scene/3d/sprite_3d.h"
@@ -952,7 +953,11 @@ void SpriteFramesEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
if (String(d["type"]) == "files") {
Vector<String> files = d["files"];
- _file_load_request(files, at_pos);
+ if (Input::get_singleton()->is_key_pressed(KEY_CONTROL)) {
+ _prepare_sprite_sheet(files[0]);
+ } else {
+ _file_load_request(files, at_pos);
+ }
}
}