diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-10 10:02:49 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-10-10 10:02:49 +0200 |
| commit | 27d61016b073fa95ced76582fc1b8106f27185da (patch) | |
| tree | 089a0a02ebd7784ea20f7bdb8e255f312254c80c | |
| parent | bfffc06eb1b1bc5f9b281edb2a6211ea81739786 (diff) | |
| parent | e81e81a56eb0771d8d0a080fd51d092c659fe14d (diff) | |
Merge pull request #67147 from gongpha/crash!-sorting-tileset-sources
Fix crashing when editing the `TileSet` field
| -rw-r--r-- | editor/plugins/tiles/tiles_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/tiles/tiles_editor_plugin.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/tiles/tiles_editor_plugin.cpp b/editor/plugins/tiles/tiles_editor_plugin.cpp index 68bc4389a2..364c3b7246 100644 --- a/editor/plugins/tiles/tiles_editor_plugin.cpp +++ b/editor/plugins/tiles/tiles_editor_plugin.cpp @@ -268,8 +268,8 @@ List<int> TilesEditorPlugin::get_sorted_sources(const Ref<TileSet> p_tile_set) c SourceNameComparator::tile_set = p_tile_set; List<int> source_ids; - for (int i = 0; i < tile_set->get_source_count(); i++) { - source_ids.push_back(tile_set->get_source_id(i)); + for (int i = 0; i < p_tile_set->get_source_count(); i++) { + source_ids.push_back(p_tile_set->get_source_id(i)); } switch (source_sort) { diff --git a/editor/plugins/tiles/tiles_editor_plugin.h b/editor/plugins/tiles/tiles_editor_plugin.h index b1fe6f8df6..bdada9ec90 100644 --- a/editor/plugins/tiles/tiles_editor_plugin.h +++ b/editor/plugins/tiles/tiles_editor_plugin.h @@ -122,7 +122,7 @@ public: // Sorting. void set_sorting_option(int p_option); - List<int> get_sorted_sources(const Ref<TileSet> tile_set) const; + List<int> get_sorted_sources(const Ref<TileSet> p_tile_set) const; virtual void edit(Object *p_object) override; virtual bool handles(Object *p_object) const override; |