amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merged behaviour from ContourMask into AlphaMask.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1181 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-30 17:15:22 +00:00
parent db09cdb5bc
commit acb3493b59
10 changed files with 89 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/script/image.cpp
+1 -7
View File
@@ -143,13 +143,7 @@ void CachedScriptableImage::generateCached(const GeneratedImage::Options& option
*size = cached_size = RealSize(options.width, options.height);
if (mask && mask->Ok()) {
// apply mask
if (mask->GetWidth() == cached_i.GetWidth() && mask->GetHeight() == cached_i.GetHeight()) {
set_alpha(cached_i, *mask);
} else {
Image mask_scaled(cached_i.GetWidth(),cached_i.GetHeight(), false);
resample(*mask,mask_scaled);
set_alpha(cached_i, mask_scaled);
}
set_alpha(cached_i, *mask);
}
if (*combine <= COMBINE_NORMAL) {
*bitmap = cached_b = Bitmap(cached_i);