[aseprite] 106/250: Rename PaintInk::Merge to PaintInk::Simple

[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 1cb8a46e1c981fedc5df48718192f52ac85a0b70
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Sep 30 08:59:01 2015 -0300

    Rename PaintInk::Merge to PaintInk::Simple
---
 src/app/tools/inks.h       | 6 +++---
 src/app/tools/tool_box.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/tools/inks.h b/src/app/tools/inks.h
index 14cb97a..0ca805c 100644
--- a/src/app/tools/inks.h
+++ b/src/app/tools/inks.h
@@ -23,7 +23,7 @@ namespace tools {
 // (or foreground/background colors)
 class PaintInk : public Ink {
 public:
-  enum Type { Merge, WithFg, WithBg, Copy, LockAlpha };
+  enum Type { Simple, WithFg, WithBg, Copy, LockAlpha };
 
 private:
   Type m_type;
@@ -40,7 +40,7 @@ public:
   {
     switch (m_type) {
 
-      case Merge:
+      case Simple:
         // Do nothing, use the default colors
         break;
 
@@ -61,7 +61,7 @@ public:
       m_proc = ink_processing[INK_BRUSH][depth];
     else {
       switch (m_type) {
-        case Merge: {
+        case Simple: {
           bool opaque = false;
 
           if (loop->getOpacity() == 255) {
diff --git a/src/app/tools/tool_box.cpp b/src/app/tools/tool_box.cpp
index 78b497a..2af9585 100644
--- a/src/app/tools/tool_box.cpp
+++ b/src/app/tools/tool_box.cpp
@@ -84,7 +84,7 @@ ToolBox::ToolBox()
   LOG("Toolbox module: installing\n");
 
   m_inks[WellKnownInks::Selection]       = new SelectionInk();
-  m_inks[WellKnownInks::Paint]           = new PaintInk(PaintInk::Merge);
+  m_inks[WellKnownInks::Paint]           = new PaintInk(PaintInk::Simple);
   m_inks[WellKnownInks::PaintFg]         = new PaintInk(PaintInk::WithFg);
   m_inks[WellKnownInks::PaintBg]         = new PaintInk(PaintInk::WithBg);
   m_inks[WellKnownInks::PaintCopy]       = new PaintInk(PaintInk::Copy);

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