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

Fix conditional type mismatch issues

Browse source
This commit is contained in:
manongjohn 2023-02-04 00:35:30 -05:00
parent fe294eb710
commit b126cd86a6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2448,7 +2448,7 @@ void FillTool::leftButtonDown(const TPointD &pos, const TMouseEvent &e) {
TImageP image = getImage(false);
TToonzImageP ti = image;
TRasterP ras = ti ? ti->getRaster() : TRasterP();
TRasterCM32P ras = ti ? ti->getRaster() : TRasterCM32P();
TPointD rasCenter = ti ? ras->getCenterD() : TPointD(0, 0);
TPointD dpiScale = getViewer()->getDpiScale();
MultiFiller filler(m_firstPoint, pos, params, m_autopaintLines.getValue(),
@ -2805,7 +2805,7 @@ void FillTool::draw() {
TImageP image = getImage(false);
TToonzImageP ti = image;
TPointD dpiScale = getViewer()->getDpiScale();
TRasterP ras = ti ? ti->getRaster() : TRasterP();
TRasterCM32P ras = ti ? ti->getRaster() : TRasterCM32P();
TPointD rasCenter = ti ? ras->getCenterD() : TPointD(0, 0);
TPointD fillPt = m_firstPoint + rasCenter;
std::vector<TPointD> symmPts =
@ -3033,7 +3033,7 @@ void FillTool::applyFill(const TImageP &img, const TPointD &pos,
if ((ti || vi) && symmetryTool && symmetryTool->isGuideEnabled()) {
TPointD dpiScale = getViewer()->getDpiScale();
TRasterP ras = ti ? ti->getRaster() : TRasterP();
TRasterCM32P ras = ti ? ti->getRaster() : TRasterCM32P();
TPointD rasCenter = ti ? ras->getCenterD() : TPointD(0, 0);
TPointD fillPt = pos + rasCenter;
std::vector<TPointD> symmPts =

2
toonz/sources/tnztools/rastertapetool.cpp
View file

@ -579,7 +579,7 @@ public:
TImageP image = getImage(false);
TToonzImageP ti = image;
TPointD dpiScale = getViewer()->getDpiScale();
TRasterP ras = ti ? ti->getRaster() : TRasterP();
TRasterCM32P ras = ti ? ti->getRaster() : TRasterCM32P();
TPointD rasCenter = ti ? ras->getCenterD() : TPointD(0, 0);
TPointD fillPt = m_firstPoint + rasCenter;
std::vector<TPointD> symmPts =