OpenToonz - An open-source full-featured 2D animation creation software
C
fix crash on creating zerary fx in camera column
shun-iwasawa469ead30c00c
diff --git a/toonz/sources/toonzqt/addfxcontextmenu.cpp b/toonz/sources/toonzqt/addfxcontextmenu.cppindex 0191e37e9..5f0ed1406 100644--- a/toonz/sources/toonzqt/addfxcontextmenu.cpp+++ b/toonz/sources/toonzqt/addfxcontextmenu.cpp@@ -556,18 +556,19 @@ void AddFxContextMenu::onAddFx(QAction *action) {m_currentCursorScenePos.setY(0);}+ int colId = m_app->getCurrentColumn()->getColumnIndex();+ // prevent crash when the camera column is selected+ if (colId < 0) colId = 0;+// the signal xsheetChanged is to be emitted in this function- TFxCommand::addFx(fx, fxs, m_app,- m_app->getCurrentColumn()->getColumnIndex(),+ TFxCommand::addFx(fx, fxs, m_app, colId,m_app->getCurrentFrame()->getFrameIndex());// move the zerary fx node to the clicked positionif (fx->isZerary() &&fx->getAttributes()->getDagNodePos() != TConst::nowhere) {- TXsheet *xsh = m_app->getCurrentXsheet()->getXsheet();- TXshZeraryFxColumn *column =- xsh->getColumn(m_app->getCurrentColumn()->getColumnIndex())- ->getZeraryFxColumn();+ TXsheet *xsh = m_app->getCurrentXsheet()->getXsheet();+ TXshZeraryFxColumn *column = xsh->getColumn(colId)->getZeraryFxColumn();if (column)column->getZeraryColumnFx()->getAttributes()->setDagNodePos(fx->getAttributes()->getDagNodePos());