[aseprite] 251/308: Save brush with images correctly when "Save Brush" button is used
Tobias Hansen
thansen at moszumanska.debian.org
Tue Mar 8 02:45:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit 67878a21cbaacab0d09d482b916fe5f6ecf7f6e6
Author: David Capello <davidcapello at gmail.com>
Date: Thu Feb 18 14:43:40 2016 -0300
Save brush with images correctly when "Save Brush" button is used
---
src/app/ui/context_bar.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index eaf2c9e..53ef26d 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -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(),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list