godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35572 from dankan1890/drag_sheet 

Create spritesheet for SpriteFrames by drag and dropping.
This commit is contained in:
Rémi Verschelde 2021-01-15 09:17:05 +01:00 committed by GitHub
parent 64ba83a096 390ff22a8c
commit 8a33107086
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -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);
}
}
}