Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 12:12:28 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix crash in the TileMapLayer editor when using editable children

Browse Source
This commit is contained in:
Gilles Roudière 2024-07-05 17:08:18 +02:00
parent c9ca3aa9ab
commit 8ebaf4437a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editor/plugins/tiles/tile_map_layer_editor.cpp
View File

@ -3630,9 +3630,16 @@ TileMapLayer *TileMapLayerEditor::_get_edited_layer() const {
void TileMapLayerEditor::_find_tile_map_layers_in_scene(Node *p_current, const Node *p_owner, Vector<TileMapLayer *> &r_list) const { void TileMapLayerEditor::_find_tile_map_layers_in_scene(Node *p_current, const Node *p_owner, Vector<TileMapLayer *> &r_list) const {
ERR_FAIL_COND(!p_current || !p_owner); ERR_FAIL_COND(!p_current || !p_owner);
if (p_current != p_owner && p_current->get_owner() != p_owner) {
if (p_current != p_owner) {
if (!p_current->get_owner()) {
return; return;
} }
if (p_current->get_owner() != p_owner && !p_owner->is_editable_instance(p_current->get_owner())) {
return;
}
}
TileMapLayer *layer = Object::cast_to<TileMapLayer>(p_current); TileMapLayer *layer = Object::cast_to<TileMapLayer>(p_current);
if (layer) { if (layer) {
r_list.append(layer); r_list.append(layer);