atiran/porymap
4
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix auto-merge

Browse source
This commit is contained in:
GriffinR 2022-06-30 00:47:31 -04:00
parent 441db4274e
commit 87b43080ba
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/tileseteditor.cpp
View file

@ -1072,7 +1072,7 @@ void TilesetEditor::on_copyButton_metatileLabel_clicked() {
QClipboard * clipboard = QGuiApplication::clipboard(); QClipboard * clipboard = QGuiApplication::clipboard();
QString label = this->ui->lineEdit_metatileLabel->text(); QString label = this->ui->lineEdit_metatileLabel->text();
if (!label.isEmpty()) { if (!label.isEmpty()) {
Tileset * tileset = Tileset::getMetatileTileset(this->getSelectedMetatile(), this->primaryTileset, this->secondaryTileset); Tileset * tileset = Tileset::getMetatileTileset(this->getSelectedMetatileId(), this->primaryTileset, this->secondaryTileset);
if (tileset) if (tileset)
label.prepend("METATILE_" + QString(tileset->name).replace("gTileset_", "") + "_"); label.prepend("METATILE_" + QString(tileset->name).replace("gTileset_", "") + "_");
} }