razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Account for Level Editor in toolbar logic

Browse source
This commit is contained in:
manongjohn 2018-12-14 14:33:24 -05:00
parent a02775df7d
commit 8a942e24e6
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
toonz/sources/tnztools/tool.cpp
View file

@ -795,10 +795,18 @@ QString TTool::updateEnabled(int rowIndex, int columnIndex) {
TXshColumn *column = (columnIndex >= 0) ? xsh->getColumn(columnIndex) : 0;
TXshLevel *xl = m_application->getCurrentLevel()->getLevel();
TXshSimpleLevel *sl = xl ? xl->getSimpleLevel() : 0;
int levelType = sl ? sl->getType() : NO_XSHLEVEL;
// If not in Level editor, let's use our current cell from the xsheet to
// find the nearest level before it
if (!m_application->getCurrentFrame()->isEditingLevel()) {
TXshCell cell = xsh->getCell(rowIndex, columnIndex);
TXshLevel *xl = cell.isEmpty() ? 0 : (TXshLevel *)(&cell.m_level);
TXshSimpleLevel *sl = cell.isEmpty() ? 0 : cell.getSimpleLevel();
int levelType = cell.isEmpty() ? NO_XSHLEVEL : cell.m_level->getType();
xl = cell.isEmpty() ? 0 : (TXshLevel *)(&cell.m_level);
sl = cell.isEmpty() ? 0 : cell.getSimpleLevel();
levelType = cell.isEmpty() ? NO_XSHLEVEL : cell.m_level->getType();
}
if (Preferences::instance()->isAutoCreateEnabled() &&
Preferences::instance()->isAnimationSheetEnabled()) {