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

Merge pull request #246 from shun-iwasawa/fix_function_editor_crash

Browse source 
Fix crash when typing an expression without selecting curve in function editor
This commit is contained in:
Shinya Kitaoka 2016-04-27 14:55:02 +09:00
commit 1ab7cf5db2
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toonz/sources/toonzqt/functionsegmentviewer.cpp
View file

@ -1173,6 +1173,7 @@ void FunctionSegmentViewer::refresh()
TDoubleKeyframe kf = m_curve->getKeyframeAt(m_r0);
int pageIndex = typeToIndex(kf.m_type);
m_typeCombo->setEnabled(true);
m_typeCombo->setCurrentIndex(pageIndex);
if (0 <= pageIndex && pageIndex < tArrayCount(m_pages)) {
m_parametersPanel->setCurrentIndex(pageIndex);
@ -1217,11 +1218,13 @@ void FunctionSegmentViewer::refresh()
QRect selectedCells = m_sheet->getSelectedCells();
/*--- 選択範囲が空のとき、もしくはカーブが選ばれていないとき ---*/
if (selectedCells.isEmpty() || !m_curve) {
m_typeCombo->setEnabled(false);
m_fromFld->setText("");
m_toFld->setText("");
}
/*--- 何かカーブが選択されている ---*/
else {
m_typeCombo->setEnabled(true);
int s0 = selectedCells.top();
int s1 = selectedCells.bottom();