fix particles fx column placement bug
This commit is contained in:
parent
e71bddec20
commit
33d474a58a
1 changed files with 11 additions and 6 deletions
|
@ -1029,12 +1029,13 @@ PlacedFx FxBuilder::makePF(TZeraryColumnFx *zcfx) {
|
||||||
PlacedFx pf;
|
PlacedFx pf;
|
||||||
pf.m_columnIndex = zcfx->getColumn()->getIndex();
|
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 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
|
// set m_fx only when the current cell is not empty
|
||||||
pf.m_fx =
|
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();
|
||||||
}
|
}
|
||||||
|
|
||||||
//-------------------------------------------------------------------
|
//-------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in a new issue