Merge pull request #1262 from manongjohn/fix_multiple_rendering_overlay

Fix missing scene overlay for Multiple Rendering options
This commit is contained in:
manongjohn 2023-11-03 17:09:48 -04:00 committed by GitHub
commit 874db59822
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1586,5 +1586,15 @@ DVAPI TFxP buildSceneFx(ToonzScene *scene, double frame, TXsheet *xsh,
if (!aff.isIdentity()) fx = TFxUtil::makeAffine(fx, aff);
// this creates an over fx to lay the Scene Overlay, if there is one, over the
// current frame
TLevelColumnFx *overlayFx = scene->getOverlayFx(frame);
if (overlayFx) {
PlacedFx overlayPf = builder.makePF(overlayFx);
TFxP overlayAffine = TFxUtil::makeAffine(overlayPf.makeFx(), aff);
fx = TFxUtil::makeOver(fx, overlayAffine);
}
return fx;
}