This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 53500c199010e6b67e8183d060e86c5c7621397d Author: David Capello <[email protected]> Date: Thu May 5 21:46:23 2016 -0300 Restore cleared area correctly when cel position is modified (fix #1109) --- src/app/cmd/clear_mask.cpp | 6 ++++-- src/app/cmd/clear_mask.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/cmd/clear_mask.cpp b/src/app/cmd/clear_mask.cpp index 1cc6dc8..ca821b6 100644 --- a/src/app/cmd/clear_mask.cpp +++ b/src/app/cmd/clear_mask.cpp @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -54,6 +54,8 @@ ClearMask::ClearMask(Cel* cel) m_dstImage.reset(new WithImage(image)); m_bgcolor = doc->bgColor(cel->layer()); + m_boundsX = bounds.x; + m_boundsY = bounds.y; m_copy.reset(crop_image(image, bounds.x, bounds.y, bounds.w, bounds.h, m_bgcolor)); @@ -112,7 +114,7 @@ void ClearMask::clear() void ClearMask::restore() { - copy_image(m_dstImage->image(), m_copy.get(), m_offsetX, m_offsetY); + copy_image(m_dstImage->image(), m_copy.get(), m_boundsX, m_boundsY); } } // namespace cmd diff --git a/src/app/cmd/clear_mask.h b/src/app/cmd/clear_mask.h index ae70dc1..94723fd 100644 --- a/src/app/cmd/clear_mask.h +++ b/src/app/cmd/clear_mask.h @@ -1,5 +1,5 @@ // Aseprite -// Copyright (C) 2001-2015 David Capello +// Copyright (C) 2001-2016 David Capello // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -42,6 +42,7 @@ namespace cmd { base::UniquePtr<WithImage> m_dstImage; ImageRef m_copy; int m_offsetX, m_offsetY; + int m_boundsX, m_boundsY; color_t m_bgcolor; }; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
