Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-02-16 15:50:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #93974 from groud/fix_crash_editable_children_tilemaplayer

Browse Source 
Fix crash in the TileMapLayer editor when using editable children
This commit is contained in:
Rémi Verschelde 2024-07-07 12:38:29 +02:00
commit fbe663940c
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
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 {
ERR_FAIL_COND(!p_current || !p_owner);
if (p_current != p_owner && p_current->get_owner() != p_owner) {
return;
if (p_current != p_owner) {
if (!p_current->get_owner()) {
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);
if (layer) {
r_list.append(layer);