mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-03-18 16:21:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore cleared area correctly when cel position is modified (fix #1109)

Browse Source
This commit is contained in:
David Capello 2016-05-05 21:46:23 -03:00
parent 6556f97b8c
commit 53500c1990
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/cmd/clear_mask.cpp
View File

@ -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

3
src/app/cmd/clear_mask.h
View File

@ -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;
};