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

fix loading note level

Browse source
This commit is contained in:
shun_iwasawa 2017-11-16 17:36:43 +09:00
parent 52a220b89a
commit 53cbe2c696
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toonz/sources/toonz/levelcreatepopup.cpp
View file

@ -436,7 +436,8 @@ bool LevelCreatePopup::apply() {
bool validColumn = true; bool validColumn = true;
if (xsh->getColumn(col)) if (xsh->getColumn(col))
validColumn = xsh->getColumn(col)->getColumnType() == 0; validColumn =
xsh->getColumn(col)->getColumnType() == TXshColumn::eLevelType;
int from = (int)m_fromFld->getValue(); int from = (int)m_fromFld->getValue();
int to = (int)m_toFld->getValue(); int to = (int)m_toFld->getValue();

4
toonz/sources/toonzlib/txshsoundtextlevel.cpp
View file

@ -56,9 +56,9 @@ void TXshSoundTextLevel::loadData(TIStream &is) {
if (v == "textSound") type = SND_TXT_XSHLEVEL; if (v == "textSound") type = SND_TXT_XSHLEVEL;
is.matchEndTag(); is.matchEndTag();
} else if (tagName == "frame") { } else if (tagName == "frame") {
QString text; std::wstring text;
is >> text; is >> text;
m_framesText.push_back(text); m_framesText.push_back(QString::fromStdWString(text));
is.matchEndTag(); is.matchEndTag();
} else } else
throw TException("unexpected tag " + tagName); throw TException("unexpected tag " + tagName);