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

fix particles fx column placement bug

Browse source
This commit is contained in:
shun-iwasawa 2022-12-22 13:13:04 +09:00 committed by manongjohn
parent e71bddec20
commit 33d474a58a
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
toonz/sources/toonzlib/scenefx.cpp
View file

@ -1029,12 +1029,13 @@ PlacedFx FxBuilder::makePF(TZeraryColumnFx *zcfx) {
PlacedFx pf;
pf.m_columnIndex = zcfx->getColumn()->getIndex();
// Add the column placement NaAffineFx
if (!getColumnPlacement(pf, m_xsh, m_frame, pf.m_columnIndex, m_isPreview))
return PlacedFx();
// if the cell is empty, only inherits its placement
if (cell.isEmpty() || cell.getFrameId().isStopFrame()) return pf;
if (cell.isEmpty() || cell.getFrameId().isStopFrame()) {
// Add the column placement NaAffineFx
if (!getColumnPlacement(pf, m_xsh, m_frame, pf.m_columnIndex, m_isPreview))
return PlacedFx();
return pf;
}
// set m_fx only when the current cell is not empty
pf.m_fx =
@ -1097,7 +1098,11 @@ PlacedFx FxBuilder::makePF(TZeraryColumnFx *zcfx) {
}
}
return pf;
// Add the column placement NaAffineFx
if (getColumnPlacement(pf, m_xsh, m_frame, pf.m_columnIndex, m_isPreview))
return pf;
else
return PlacedFx();
}
//-------------------------------------------------------------------