[aseprite] 240/308: Show ink selector even when a custom brush is selected

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 24e329ffeb717c8d163a6253444daa767938c6cf
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Feb 15 20:40:37 2016 -0300

    Show ink selector even when a custom brush is selected
    
    Related to #945, anyway it needs more work so we can mix the custom
    brush as a color source for the current ink.
---
 src/app/ui/context_bar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/ui/context_bar.cpp b/src/app/ui/context_bar.cpp
index f3e334f..eaf2c9e 100644
--- a/src/app/ui/context_bar.cpp
+++ b/src/app/ui/context_bar.cpp
@@ -1550,7 +1550,7 @@ void ContextBar::updateForTool(tools::Tool* tool)
   m_brushSize->setVisible(supportOpacity && !isFloodfill && !hasImageBrush);
   m_brushAngle->setVisible(supportOpacity && !isFloodfill && !hasImageBrush && hasBrushWithAngle);
   m_brushPatternField->setVisible(supportOpacity && hasImageBrush);
-  m_inkType->setVisible(hasInk && !hasImageBrush);
+  m_inkType->setVisible(hasInk);
   m_inkOpacityLabel->setVisible(showOpacity);
   m_inkOpacity->setVisible(showOpacity);
   m_inkShades->setVisible(hasInkShades);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git