OpenToonz - An open-source full-featured 2D animation creation software
C
Fix Smart Raster Brush Lock Alpha Tone
justburner5aabe89a6771
diff --git a/toonz/sources/tnztools/bluredbrush.cpp b/toonz/sources/tnztools/bluredbrush.cppindex ff463e385..44f521475 100644--- a/toonz/sources/tnztools/bluredbrush.cpp+++ b/toonz/sources/tnztools/bluredbrush.cpp@@ -51,10 +51,12 @@ void putOnRasterCM(const TRasterCM32P &out, const TRaster32P &in, int styleId,continue;}bool sameStyleId = styleId == outPix->getInk();+ // line with lock alpha : use original pixel's tone// line with the same style : multiply tones// line with different style : pick darker tone- int tone = sameStyleId ? outPix->getTone() * (255 - inPix->m) / 255- : std::min(255 - inPix->m, outPix->getTone());+ int tone = lockAlpha ? outPix->getTone()+ : sameStyleId ? outPix->getTone() * (255 - inPix->m) / 255+ : std::min(255 - inPix->m, outPix->getTone());int ink = !sameStyleId && outPix->getTone() < 255 - inPix->m? outPix->getInk(): styleId;diff --git a/toonz/sources/tnztools/mypainttoonzbrush.cpp b/toonz/sources/tnztools/mypainttoonzbrush.cppindex deb9b0433..cbf0728f8 100644--- a/toonz/sources/tnztools/mypainttoonzbrush.cpp+++ b/toonz/sources/tnztools/mypainttoonzbrush.cpp@@ -32,10 +32,12 @@ void putOnRasterCM(const TRasterCM32P &out, const TRaster32P &in, int styleId,continue;}bool sameStyleId = styleId == outPix->getInk();+ // line with lock alpha : use original pixel's tone// line with the same style : multiply tones// line with different style : pick darker tone- int tone = sameStyleId ? outPix->getTone() * (255 - inPix->m) / 255- : std::min(255 - inPix->m, outPix->getTone());+ int tone = lockAlpha ? outPix->getTone()+ : sameStyleId ? outPix->getTone() * (255 - inPix->m) / 255+ : std::min(255 - inPix->m, outPix->getTone());int ink = !sameStyleId && outPix->getTone() < 255 - inPix->m? outPix->getInk(): styleId;diff --git a/toonz/sources/toonzlib/rasterstrokegenerator.cpp b/toonz/sources/toonzlib/rasterstrokegenerator.cppindex cb9edf81c..aaec5afa8 100644--- a/toonz/sources/toonzlib/rasterstrokegenerator.cpp+++ b/toonz/sources/toonzlib/rasterstrokegenerator.cpp@@ -215,7 +215,8 @@ void RasterStrokeGenerator::placeOver(const TRasterCM32P &out,}}if (inTone <= outTone) {- *outPix = TPixelCM32(inPix->getInk(), outPix->getPaint(), inTone);+ *outPix = TPixelCM32(inPix->getInk(), outPix->getPaint(),+ m_modifierLockAlpha ? outTone : inTone);}}if (m_task == ERASE) {