mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-13 14:07:01 -04:00
SetCombineImage now actually does something (this fixes issues guild watermarks)
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@381 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -93,7 +93,7 @@ Image SetCombineImage::generate(const Options& opt) const {
|
|||||||
return image->generate(opt);
|
return image->generate(opt);
|
||||||
}
|
}
|
||||||
ImageCombine SetCombineImage::combine() const {
|
ImageCombine SetCombineImage::combine() const {
|
||||||
return image->combine();
|
return image_combine;
|
||||||
}
|
}
|
||||||
bool SetCombineImage::operator == (const GeneratedImage& that) const {
|
bool SetCombineImage::operator == (const GeneratedImage& that) const {
|
||||||
const SetCombineImage* that2 = dynamic_cast<const SetCombineImage*>(&that);
|
const SetCombineImage* that2 = dynamic_cast<const SetCombineImage*>(&that);
|
||||||
|
|||||||
Reference in New Issue
Block a user