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

Merge pull request #928 from shun-iwasawa/sound_levelsettings

Browse source 
Level settings and info for sound levels
This commit is contained in:
Jeremy Bullock 2016-11-21 12:38:36 -07:00 committed by GitHub
commit 1900e185ca
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
toonz/sources/toonz/levelsettingspopup.cpp
View file

@ -1113,7 +1113,7 @@ public:
cellSelection->getSelectedCells(r0, c0, r1, c1);
for (int c = c0; c <= c1; c++) {
for (int r = r0; r <= r1; r++) {
TXshLevel *lv = xsh->getCell(r, c).getSimpleLevel();
TXshLevel *lv = xsh->getCell(r, c).m_level.getPointer();
if (!lv) continue;
std::vector<TXshLevel *>::iterator lvIt =
find(selectedLevels.begin(), selectedLevels.end(), lv);

4
toonz/sources/toonz/xshcellviewer.cpp
View file

@ -2130,9 +2130,9 @@ void CellArea::createCellMenu(QMenu &menu, bool isCellSelected) {
}
if (isCellSelected) {
if (!soundCellsSelected) {
menu.addAction(cmdManager->getAction(MI_LevelSettings));
menu.addAction(cmdManager->getAction(MI_LevelSettings));
if (!soundCellsSelected) {
//- force reframe
QMenu *reframeSubMenu = new QMenu(tr("Reframe"), this);
{