diff --git a/CHANGELOG.md b/CHANGELOG.md index 984f3879..4f1f5a13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,6 +58,7 @@ The **"Breaking Changes"** listed below are changes that have been made in the d - Fix `Add Region Map...` not updating the region map settings file. - Fix some crashes on invalid region map tilesets. - Improve error reporting for invalid region map editor settings. +- Fix the region map editor's palette resetting between region maps. - Fix config files being written before the project is opened successfully. - Fix the map and other project info still displaying if a new project fails to open. - Fix unsaved changes being ignored when quitting (such as with Cmd+Q on macOS). diff --git a/src/ui/regionmapeditor.cpp b/src/ui/regionmapeditor.cpp index b66d442b..493ea78e 100644 --- a/src/ui/regionmapeditor.cpp +++ b/src/ui/regionmapeditor.cpp @@ -774,7 +774,10 @@ void RegionMapEditor::displayRegionMapTileSelector() { this->mapsquare_selector_item = new TilemapTileSelector(this->region_map->pngPath(), this->region_map->tilemapFormat(), this->region_map->palPath()); - this->mapsquare_selector_item->draw(); + // Initialize with current settings + this->mapsquare_selector_item->selectHFlip(ui->checkBox_tileHFlip->isChecked()); + this->mapsquare_selector_item->selectVFlip(ui->checkBox_tileVFlip->isChecked()); + this->mapsquare_selector_item->selectPalette(ui->spinBox_tilePalette->value()); // This will also draw the selector this->scene_region_map_tiles->addItem(this->mapsquare_selector_item);