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

Fix for restoreColors()

Browse source 
restoreColors() needed a fix to not clear the paint of unclosed shapes.
This commit is contained in:
Tom 2023-10-06 22:00:11 -04:00
parent dc046e027c
commit 313f5e0eb4
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
toonz/sources/tnztools/filltool.cpp
View file

@ -1051,15 +1051,13 @@ void fillAreaWithUndo(const TImageP &img, const TRectD &area, TStroke *stroke,
for (int tempY = 0; tempY < tempRaster->getLy(); tempY++) {
for (int tempX = 0; tempX < tempRaster->getLx();
tempX++, tempPix++, keepPix++) {
if (tempPix->getInk() >= IGNORECOLORSTYLE ||
tempPix->getPaint() >= IGNORECOLORSTYLE) {
continue;
} else {
// Handle all other pixels
if (tempPix->getInk() < IGNORECOLORSTYLE) {
keepPix->setInk(tempPix->getInk());
keepPix->setPaint(tempPix->getPaint());
keepPix->setTone(tempPix->getTone());
}
if (tempPix->getPaint() < IGNORECOLORSTYLE) {
keepPix->setPaint(tempPix->getPaint());
}
keepPix->setTone(tempPix->getTone());
}
}

5
toonz/sources/toonzlib/fillutil.cpp
View file

@ -99,8 +99,9 @@ void restoreColors(const TRasterCM32P &r,
// in order to make the paint to protrude behind the line
params.m_prevailing = false;
for (UINT i = 0; i < seeds.size(); i++) {
params.m_p = seeds[i].first;
params.m_styleId = seeds[i].second;
params.m_p = seeds[i].first;
// params.m_styleId = seeds[i].second;
params.m_styleId = IGNORECOLORSTYLE;
fill(r, params);
}
}