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

Save brush with images correctly when "Save Brush" button is used

Browse Source
This commit is contained in:
David Capello 2016-02-18 14:43:40 -03:00
parent 9521ed3079
commit 67878a21cb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/ui/context_bar.cpp
View File

@ -1729,9 +1729,10 @@ doc::BrushRef ContextBar::createBrushFromPreferences(ToolPreferences::Brush* bru
BrushSlot ContextBar::createBrushSlotFromPreferences()
{
tools::Tool* activeTool = App::instance()->activeTool();
auto& pref = Preferences::instance();
auto& saveBrush = pref.saveBrush;
auto& toolPref = pref.tool(App::instance()->activeTool());
auto& toolPref = pref.tool(activeTool);
int flags = 0;
if (saveBrush.brushType()) flags |= int(BrushSlot::Flags::BrushType);
@ -1746,7 +1747,7 @@ BrushSlot ContextBar::createBrushSlotFromPreferences()
return BrushSlot(
BrushSlot::Flags(flags),
createBrushFromPreferences(),
activeBrush(activeTool),
pref.colorBar.fgColor(),
pref.colorBar.bgColor(),
toolPref.ink(),