diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-08 10:04:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-08 10:04:30 +0200 |
| commit | de33c37196f0ddec675640fcfeaaa46a17d9ebf2 (patch) | |
| tree | cc344bdc97850745618c752a029a53367fbdd0b5 /editor/plugins/tile_map_editor_plugin.cpp | |
| parent | d211aff777ec338a5f57cece1c7bf76120d0622d (diff) | |
| parent | a3af9d5714503bfdb1e524fee5ebc2da08e92d98 (diff) | |
| download | redot-engine-de33c37196f0ddec675640fcfeaaa46a17d9ebf2.tar.gz | |
Merge pull request #27565 from SpechtMagnus/tileset_autotile_ignore_flags
Added ignore flag / wildcard bit to tileset autotile
Diffstat (limited to 'editor/plugins/tile_map_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/tile_map_editor_plugin.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index 8a18af7ae8..33e4bb2336 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -481,10 +481,10 @@ void TileMapEditor::_update_palette() { if (sel_tile != TileMap::INVALID_CELL) { if ((manual_autotile && tileset->tile_get_tile_mode(sel_tile) == TileSet::AUTO_TILE) || tileset->tile_get_tile_mode(sel_tile) == TileSet::ATLAS_TILE) { - const Map<Vector2, uint16_t> &tiles2 = tileset->autotile_get_bitmask_map(sel_tile); + const Map<Vector2, uint32_t> &tiles2 = tileset->autotile_get_bitmask_map(sel_tile); Vector<Vector2> entries2; - for (const Map<Vector2, uint16_t>::Element *E = tiles2.front(); E; E = E->next()) { + for (const Map<Vector2, uint32_t>::Element *E = tiles2.front(); E; E = E->next()) { entries2.push_back(E->key()); } entries2.sort(); |