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

Create spritesheet for SpriteFrames by drag and dropping. 

Close godotengine/godot-proposals#378

(cherry picked from commit 390ff22a8c)
This commit is contained in:
dankan1890 2021-01-12 00:51:59 +01:00 committed by Rémi Verschelde
parent c47ad12e80
commit 32a0a50fcf
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -31,6 +31,8 @@
#include "sprite_frames_editor_plugin.h" #include "sprite_frames_editor_plugin.h"
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/os/input.h"
#include "core/os/keyboard.h"
#include "core/project_settings.h" #include "core/project_settings.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
@ -861,7 +863,11 @@ void SpriteFramesEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da
PoolVector<String> files = d["files"]; PoolVector<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);
}
} }
} }