asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #67147 from gongpha/crash!-sorting-tileset-sources

Browse source 
Fix crashing when editing the `TileSet` field
This commit is contained in:
Rémi Verschelde 2022-10-10 10:02:49 +02:00
commit 27d61016b0
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/tiles/tiles_editor_plugin.cpp
View file

@ -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) {

2
editor/plugins/tiles/tiles_editor_plugin.h
View file

@ -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;