mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-14 04:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore current ink mode for custom brushes

Browse Source
This commit is contained in:
David Capello 2015-05-04 19:18:12 -03:00
parent 88930a6d69
commit a4db7ff0eb
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/tools/inks.h
View File

@ -58,27 +58,19 @@ public:
int depth = MID(0, loop->sprite()->pixelFormat(), 2);
switch (m_type) {
case Opaque:
if (loop->getBrush()->type() == doc::kImageBrushType)
m_proc = ink_processing[INK_BRUSH][depth];
else
m_proc = ink_processing[INK_OPAQUE][depth];
break;
case SetAlpha:
m_proc = ink_processing[INK_SETALPHA][depth];
break;
case LockAlpha:
m_proc = ink_processing[INK_LOCKALPHA][depth];
break;
default:
if (loop->getBrush()->type() == doc::kImageBrushType)
m_proc = ink_processing[INK_BRUSH][depth];
else
if (loop->getBrush()->type() == doc::kImageBrushType)
m_proc = ink_processing[INK_BRUSH][depth];
else {
switch (m_type) {
case Opaque: m_proc = ink_processing[INK_OPAQUE][depth]; break;
case SetAlpha: m_proc = ink_processing[INK_SETALPHA][depth]; break;
case LockAlpha: m_proc = ink_processing[INK_LOCKALPHA][depth]; break;
default:
m_proc = (loop->getOpacity() == 255 ?
ink_processing[INK_OPAQUE][depth]:
ink_processing[INK_TRANSPARENT][depth]);
break;
break;
}
}
}