这是indexloc提供的服务，不要输入任何密码
Skip to content

Fix keyframe opacity being adjusted globally in canvas rendering #1939

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2025
Merged

Fix keyframe opacity being adjusted globally in canvas rendering #1939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions core_lib/src/canvaspainter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ void CanvasPainter::paintOnionSkinFrame(QPainter& painter, QPainter& onionSkinPa
// Don't transform the image here as we used the viewTransform in the image output
painter.setWorldMatrixEnabled(false);
// Remember to adjust overall opacity based on opacity value from image
painter.setOpacity(frameOpacity - (1.0-painter.opacity()));
onionSkinPainter.setOpacity(frameOpacity - (1.0-painter.opacity()));
if (colorize)
{
QColor colorBrush = Qt::transparent; //no color for the current frame
Expand Down Expand Up @@ -295,9 +295,9 @@ void CanvasPainter::paintCurrentBitmapFrame(QPainter& painter, const QRect& blit
QPainter currentBitmapPainter;
initializePainter(currentBitmapPainter, mCurrentLayerPixmap, blitRect);

painter.setOpacity(paintedImage->getOpacity() - (1.0-painter.opacity()));
painter.setWorldMatrixEnabled(false);

currentBitmapPainter.setOpacity(paintedImage->getOpacity() - (1.0-painter.opacity()));
currentBitmapPainter.drawImage(paintedImage->topLeft(), *paintedImage->image());

if (isCurrentLayer && isDrawing)
Expand Down Expand Up @@ -337,6 +337,8 @@ void CanvasPainter::paintCurrentVectorFrame(QPainter& painter, const QRect& blit
}

// Paint existing vector image to the painter
// Remember to adjust opacity based on additional opacity value from the keyframe
currentVectorPainter.setOpacity(vectorImage->getOpacity() - (1.0-painter.opacity()));
vectorImage->paintImage(currentVectorPainter, *mObject, mOptions.bOutlines, mOptions.bThinLines, mOptions.bAntiAlias);

if (isCurrentLayer && isDrawing) {
Expand All @@ -352,8 +354,6 @@ void CanvasPainter::paintCurrentVectorFrame(QPainter& painter, const QRect& blit
painter.setWorldMatrixEnabled(false);
painter.setTransform(QTransform());

// Remember to adjust opacity based on additional opacity value from the keyframe
painter.setOpacity(vectorImage->getOpacity() - (1.0-painter.opacity()));
painter.drawPixmap(mPointZero, mCurrentLayerPixmap);
}

Expand Down
Loading