diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-18 14:29:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 14:29:58 +0100 |
| commit | 5c8bd6fd71ac289415f0ff670442cd52bdc0d52b (patch) | |
| tree | f2b2b3c3e1f1d67b1df414d08f054c2f1f8c8331 /editor | |
| parent | da26fcc91a5643d592067d44d6cace34295fadda (diff) | |
| parent | f19cd44346a68a649cabfe85cc3ba7a44ceb0ca4 (diff) | |
Merge pull request #58233 from bruvzg/gde_ts
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/debugger/script_editor_debugger.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_spin_slider.cpp | 2 | ||||
| -rw-r--r-- | editor/import/dynamic_font_import_settings.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index bb6428cdf0..40b53c2636 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -392,7 +392,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da stack_dump_info.push_back(d); s->set_metadata(0, d); - String line = itos(i) + " - " + String(d["file"]) + ":" + itos(d["line"]) + " - at function: " + d["function"]; + String line = itos(i) + " - " + String(d["file"]) + ":" + itos(d["line"]) + " - at function: " + String(d["function"]); s->set_text(0, line); if (i == 0) { diff --git a/editor/editor_spin_slider.cpp b/editor/editor_spin_slider.cpp index 2fd4f3d6e6..9bf3c4c590 100644 --- a/editor/editor_spin_slider.cpp +++ b/editor/editor_spin_slider.cpp @@ -346,7 +346,7 @@ void EditorSpinSlider::_draw_spin_slider() { text_ofs.x += glyphs[i].advance; } } - TS->free(num_rid); + TS->free_rid(num_rid); if (get_step() == 1) { Ref<Texture2D> updown2 = get_theme_icon(is_read_only() ? SNAME("updown_disabled") : SNAME("updown"), SNAME("SpinBox")); diff --git a/editor/import/dynamic_font_import_settings.cpp b/editor/import/dynamic_font_import_settings.cpp index 5d8f14a978..20349e8ccb 100644 --- a/editor/import/dynamic_font_import_settings.cpp +++ b/editor/import/dynamic_font_import_settings.cpp @@ -645,7 +645,7 @@ void DynamicFontImportSettings::_glyph_text_selected() { selected_glyphs.insert(gl[i].index); } } - TS->free(text_rid); + TS->free_rid(text_rid); label_glyphs->set_text(TTR("Preloaded glyphs: ") + itos(selected_glyphs.size())); } _range_selected(); |