Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Replace and delete image should be applied to the correct channel now.

Browse source 
--HG--
branch : gsoc2014-dfighter
This commit is contained in:
dfighter1985 2014-07-30 14:39:19 +02:00
parent 7b1ee54427
commit 4bff87ca36
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
View file

@ -728,7 +728,7 @@ void TileEditorMainWindow::onActionDeleteImage( int tabId )
}
TileItemNode *n = reinterpret_cast< TileItemNode* >( idx.internalPointer() );
n->setTileFilename( TileModel::TileDiffuse, "" );
n->setTileFilename( TileItemNode::displayChannel(), "" );
}
void TileEditorMainWindow::onActionReplaceImage( int tabId )
@ -752,7 +752,7 @@ void TileEditorMainWindow::onActionReplaceImage( int tabId )
return;
TileItemNode *n = reinterpret_cast< TileItemNode* >( idx.internalPointer() );
n->setTileFilename( TileModel::TileDiffuse, fileName );
n->setTileFilename( TileItemNode::displayChannel(), fileName );
}
void TileEditorMainWindow::onTileSetRemoved( const QString &set )

1
code/studio/src/plugins/tile_editor/tile_item.h
View file

@ -117,6 +117,7 @@ public:
int id() const{ return m_tileId; }
static void setDisplayChannel( TileModel::TTileChannel channel ){ s_displayChannel = channel; }
static TileModel::TTileChannel displayChannel(){ return s_displayChannel; }
private:
int m_tileId;