Merge pull request #69842 from timothyqiu/tile-set-update

Fix !tile_set.is_valid() error on startup
2022-12-10 10:45:52 +01:00
parent daa504c640 8a22d4cd44
commit cc5d2c68a8
1 changed files with 3 additions and 1 deletions
--- a/editor/plugins/tiles/tile_set_editor.cpp
+++ b/editor/plugins/tiles/tile_set_editor.cpp
@@ -120,7 +120,9 @@ bool TileSetEditor::_can_drop_data_fw(const Point2 &p_point, const Variant &p_da
 }

 void TileSetEditor::_update_sources_list(int force_selected_id) {
-	ERR_FAIL_COND(!tile_set.is_valid());
+	if (tile_set.is_null()) {
+		return;
+	}

 	// Get the previously selected id.
 	int old_selected = TileSet::INVALID_SOURCE;