diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-20 13:22:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-20 13:22:47 +0200 |
| commit | 372cdc20705dab7c2227b89d8bc4d425ffd3e8a4 (patch) | |
| tree | a8811a50265edd940b00e12b9bd522e3e9b4694e /editor/plugins/sprite_frames_editor_plugin.cpp | |
| parent | ecd226c6a751f8a20766363fd1f2e1e0e2da8fba (diff) | |
| parent | 5ad9be4c24e9d7dc5672fdc42cea896622fe5685 (diff) | |
| download | redot-engine-372cdc20705dab7c2227b89d8bc4d425ffd3e8a4.tar.gz | |
Merge pull request #11153 from letheed/rename-pos
Rename pos/rot/loc/scl
Diffstat (limited to 'editor/plugins/sprite_frames_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/sprite_frames_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 7b40f69082..b9cb1788f0 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -544,7 +544,7 @@ Variant SpriteFramesEditor::get_drag_data_fw(const Point2 &p_point, Control *p_f if (!frames->has_animation(edited_anim)) return false; - int idx = tree->get_item_at_pos(p_point, true); + int idx = tree->get_item_at_position(p_point, true); if (idx < 0 || idx >= frames->get_frame_count(edited_anim)) return Variant(); @@ -609,7 +609,7 @@ void SpriteFramesEditor::drop_data_fw(const Point2 &p_point, const Variant &p_da if (!d.has("type")) return; - int at_pos = tree->get_item_at_pos(p_point, true); + int at_pos = tree->get_item_at_position(p_point, true); if (String(d["type"]) == "resource" && d.has("resource")) { RES r = d["resource"]; @@ -643,7 +643,7 @@ void SpriteFramesEditor::_bind_methods() { ClassDB::bind_method(D_METHOD("_empty2_pressed"), &SpriteFramesEditor::_empty2_pressed); ClassDB::bind_method(D_METHOD("_delete_pressed"), &SpriteFramesEditor::_delete_pressed); ClassDB::bind_method(D_METHOD("_paste_pressed"), &SpriteFramesEditor::_paste_pressed); - ClassDB::bind_method(D_METHOD("_file_load_request", "files", "atpos"), &SpriteFramesEditor::_file_load_request, DEFVAL(-1)); + ClassDB::bind_method(D_METHOD("_file_load_request", "files", "at_position"), &SpriteFramesEditor::_file_load_request, DEFVAL(-1)); ClassDB::bind_method(D_METHOD("_update_library", "skipsel"), &SpriteFramesEditor::_update_library, DEFVAL(false)); ClassDB::bind_method(D_METHOD("_up_pressed"), &SpriteFramesEditor::_up_pressed); ClassDB::bind_method(D_METHOD("_down_pressed"), &SpriteFramesEditor::_down_pressed); |