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

Merge pull request #972 from manongjohn/fix_rect_autofill_pencil

Browse source 
Fix Autopaint for Pencil lines
This commit is contained in:
manongjohn 2022-04-19 10:40:32 -04:00 committed by GitHub
commit 5bd888a260
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
toonz/sources/include/toonz/fill.h
View file

@ -94,7 +94,8 @@ bool DVAPI inkSegment(const TRasterCM32P &r, const TPoint &p, int ink,
void DVAPI rectFillInk(const TRasterCM32P &ras, const TRect &r, int color);
void DVAPI fillautoInks(TRasterCM32P &r, TRect &rect,
const TRasterCM32P &rbefore, TPalette *plt);
const TRasterCM32P &rbefore, TPalette *plt,
int fillIndex);
void DVAPI fullColorFill(const TRaster32P &ras, const FillParameters &params,
TTileSaverFullColor *saver = 0, TXsheet *xsheet = 0,

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

@ -631,7 +631,7 @@ public:
m_tiles->getTile(m_tiles->getTileCount() - 1);
TRasterCM32P rbefore;
tile->getRaster(rbefore);
fillautoInks(ras, rect, rbefore, m_palette);
fillautoInks(ras, rect, rbefore, m_palette, m_closeStyleIndex);
}
}
TTool::Application *app = TTool::getApplication();
@ -1057,7 +1057,7 @@ void fillAreaWithUndo(const TImageP &img, const TRectD &area, TStroke *stroke,
tileSet->getTile(tileSet->getTileCount() - 1);
TRasterCM32P rbefore;
tile->getRaster(rbefore);
fillautoInks(ras, rect, rbefore, plt);
fillautoInks(ras, rect, rbefore, plt, cs);
}
}
ToolUtils::updateSaveBox(sl, fid);

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

@ -159,7 +159,7 @@ AreaFiller::~AreaFiller() { m_ras->unlock(); }
// che confinano con le aree appena fillate con il rect. rbefore e' il rect del
// raster prima del rectfill.
void fillautoInks(TRasterCM32P &rin, TRect &rect, const TRasterCM32P &rbefore,
TPalette *plt) {
TPalette *plt, int fillIndex) {
assert(plt);
TRasterCM32P r = rin->extract(rect);
assert(r->getSize() == rbefore->getSize());
@ -172,7 +172,7 @@ void fillautoInks(TRasterCM32P &rin, TRect &rect, const TRasterCM32P &rbefore,
int paint = pix->getPaint();
int tone = pix->getTone();
int ink = pix->getInk();
if (paint != pixb->getPaint() && tone > 0 && tone < 255 && ink != paint &&
if (paint != pixb->getPaint() && paint == fillIndex && ink != paint &&
plt->getStyle(ink)->getFlags() != 0)
inkFill(rin, TPoint(j, i) + rect.getP00(), paint, 0, NULL, &rect);
}