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

Fix brush preview in tiles mode when the fg color is the mask color

Browse Source 
The FG color shouldn't have relevance when we are in tiles mode (only
the fg tile should have it).
This commit is contained in:
David Capello 2020-08-24 15:37:08 -03:00
parent 0c351f6fcf
commit 162f6d802a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/ui/editor/brush_preview.cpp
View File

@ -125,6 +125,9 @@ void BrushPreview::show(const gfx::Point& screenPos)
// Get the current tool
tools::Ink* ink = m_editor->getCurrentEditorInk();
// Get current tilemap mode
TilemapMode tilemapMode = ColorBar::instance()->tilemapMode();
const bool isFloodfill = m_editor->getCurrentEditorTool()->getPointShape(0)->isFloodFill();
const auto& dynamics = App::instance()->contextBar()->getDynamics();
@ -148,6 +151,7 @@ void BrushPreview::show(const gfx::Point& screenPos)
m_type = SELECTION_CROSSHAIR;
}
else if (
(tilemapMode == TilemapMode::Pixels) &&
(brush->type() == kImageBrushType ||
((isFloodfill ? 1: brush->size()) > (1.0 / m_editor->zoom().scale()))) &&
(// Use cursor bounds for inks that are effects (eraser, blur, etc.)