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

Merge pull request #71885 from KoBeWi/NullItemEditor 

Fix handling of nulls in some editors
This commit is contained in:
Rémi Verschelde 2023-01-23 10:24:46 +01:00
parent 84c081945f 80723d2537
commit db23d7a47c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -3990,6 +3990,10 @@ void CanvasItemEditor::_selection_changed() {
}
void CanvasItemEditor::edit(CanvasItem *p_canvas_item) {
if (!p_canvas_item) {
return;
}
Array selection = editor_selection->get_selected_nodes();
if (selection.size() != 1 || Object::cast_to<Node>(selection[0]) != p_canvas_item) {
_reset_drag();

10
editor/plugins/theme_editor_plugin.cpp
View File

@ -3335,8 +3335,10 @@ void ThemeTypeEditor::set_edited_theme(const Ref<Theme> &p_theme) {
}
edited_theme = p_theme;
edited_theme->connect("changed", callable_mp(this, &ThemeTypeEditor::_update_type_list_debounced));
_update_type_list();
if (edited_theme.is_valid()) {
edited_theme->connect("changed", callable_mp(this, &ThemeTypeEditor::_update_type_list_debounced));
_update_type_list();
}
add_type_dialog->set_edited_theme(edited_theme);
}
@ -3496,7 +3498,9 @@ void ThemeEditor::edit(const Ref<Theme> &p_theme) {
preview_tab->set_preview_theme(p_theme);
}
theme_name->set_text(TTR("Theme:") + " " + theme->get_path().get_file());
if (theme.is_valid()) {
theme_name->set_text(TTR("Theme:") + " " + theme->get_path().get_file());
}
}
Ref<Theme> ThemeEditor::get_edited_theme() {