Skip to content

Script: Improved combine_blend error message #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
normaldream wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Script: Improved combine_blend error message #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/gfx/generated_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ bool MaskedBlendImage::operator == (const GeneratedImage& that) const {

Image CombineBlendImage::generate(const Options& opt) const {
Image img = image1->generate(opt);
combine_image(img, image2->generate(opt), image_combine);
Image img2 = image2->generate(opt);
if (img.GetWidth() != img2.GetWidth() || img.GetHeight() != img2.GetHeight())
throw ScriptError(_("Combined images must be of the same size"));
combine_image(img, img2, image_combine);
return img;
}
ImageCombine CombineBlendImage::combine() const {
Expand Down