OpenToonz - An open-source full-featured 2D animation creation software
C
Hold Alt to toggle Region definition preference in Fill Tool
Abel Youae40dc74f526
diff --git a/toonz/sources/tnztools/filltool.cpp b/toonz/sources/tnztools/filltool.cppindex bcec4207d..bf1790240 100644--- a/toonz/sources/tnztools/filltool.cpp+++ b/toonz/sources/tnztools/filltool.cpp@@ -1043,7 +1043,7 @@ void drawReferImage(TRaster32P &ras, TXsheet *xsh, int col, int row,// Combine all transformationsTAffine finalAff = TTranslation(saveboxoffset) *TTranslation(ras->getCenterD()) * curAff.inv() * aff *- TTranslation(-ras->getCenterD()) * centerAlignment;+ TTranslation(-ras->getCenterD()) * centerAlignment;// Put refer Imageif (ti) {@@ -2190,6 +2190,11 @@ FillParameters FillTool::getFillParameters() const {//-----------------------------------------------------------------------------void FillTool::leftButtonDown(const TPointD &pos, const TMouseEvent &e) {+ m_isAltPressed = e.isAltPressed();+ if (m_isAltPressed)+ Preferences::instance()->setValue(PreferencesItemId::DefRegionWithPaint,+ !DEF_REGION_WITH_PAINT);+m_clickPoint = pos;// Area modeif (m_fillType.getValue() != NORMALFILL) {@@ -2317,17 +2322,15 @@ void FillTool::leftButtonUp(const TPointD &pos, const TMouseEvent &e) {if (m_fillType.getValue() != NORMALFILL) {buildFillInfo(params); // Frame range, refFill and so onm_areaFillTool->leftButtonUp(pos, e);- return;}// Line mode- if ((m_colorType.getValue() == LINES) && m_targetType == TTool::ToonzImage) {+ else if ((m_colorType.getValue() == LINES) && m_targetType == TTool::ToonzImage) {m_normalLineFillTool->leftButtonUp(pos, e, getImage(true), params);- return;}// Normal Fill- if (m_onion.getValue() && m_onionStyleId > 0) {+ else if (m_onion.getValue() && m_onionStyleId > 0) {buildFillInfo(params); // Frame range, refFill and so ondoRefFill(getImage(true),m_refImgTable[m_level->getImageId(getCurrentFid(), false)], pos,@@ -2336,6 +2339,10 @@ void FillTool::leftButtonUp(const TPointD &pos, const TMouseEvent &e) {m_onionStyleId = 0;invalidate();}++ if (m_isAltPressed)+ Preferences::instance()->setValue(PreferencesItemId::DefRegionWithPaint,+ (!DEF_REGION_WITH_PAINT));}//-----------------------------------------------------------------------------diff --git a/toonz/sources/tnztools/filltool.h b/toonz/sources/tnztools/filltool.hindex ae504d214..9e36b4b90 100644--- a/toonz/sources/tnztools/filltool.h+++ b/toonz/sources/tnztools/filltool.h@@ -119,7 +119,9 @@ class FillTool final : public QObject, public TTool {TBoolProperty m_autopaintLines;SlFidsPairs m_slFidsPairs;- RefImgTable m_refImgTable;// imageId+ RefImgTable m_refImgTable; // imageId++ bool m_isAltPressed = false;public:FillTool(int targetType);