fix antialias to toonz raster levels (#2370)

This commit is contained in:
shun-iwasawa 2018-11-12 18:56:53 +09:00 committed by masafumi-inoue
parent 0aebf86bcd
commit fdece91b5e

View file

@ -1158,6 +1158,12 @@ void TLevelColumnFx::doCompute(TTile &tile, double frame,
ras = ti->getRaster(); ras = ti->getRaster();
if (sl->getProperties()->antialiasSoftness() > 0) { if (sl->getProperties()->antialiasSoftness() > 0) {
// convert colormap raster to fullcolor raster before applying antialias
if (ti) {
TRaster32P convRas(ras->getSize());
TRop::convert(convRas, ras, ti->getPalette(), TRect(), false, true);
ras = convRas;
}
TRasterP appRas = ras->create(ras->getLx(), ras->getLy()); TRasterP appRas = ras->create(ras->getLx(), ras->getLy());
TRop::antialias(ras, appRas, 10, TRop::antialias(ras, appRas, 10,
sl->getProperties()->antialiasSoftness()); sl->getProperties()->antialiasSoftness());
@ -1206,7 +1212,7 @@ void TLevelColumnFx::doCompute(TTile &tile, double frame,
// Observe that inTile is in the standard reference, ie image's minus the // Observe that inTile is in the standard reference, ie image's minus the
// center coordinates // center coordinates
if (ti) { if ((TRasterCM32P)ras) {
// In the colormapped case, we have to convert the cmap to fullcolor // In the colormapped case, we have to convert the cmap to fullcolor
TPalette *palette = ti->getPalette(); TPalette *palette = ti->getPalette();