From 99bd13ee0b52a22125d643f1a8322f86ea3d5169 Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Tue, 15 May 2007 16:35:51 +0000
Subject: [PATCH] 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
---
 src/gfx/generated_image.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gfx/generated_image.cpp b/src/gfx/generated_image.cpp
index 01f19a99..c46e12d3 100644
--- a/src/gfx/generated_image.cpp
+++ b/src/gfx/generated_image.cpp
@@ -93,7 +93,7 @@ Image SetCombineImage::generate(const Options& opt) const {
 	return image->generate(opt);
 }
 ImageCombine SetCombineImage::combine() const {
-	return image->combine();
+	return image_combine;
 }
 bool SetCombineImage::operator == (const GeneratedImage& that) const {
 	const SetCombineImage* that2 = dynamic_cast<const SetCombineImage*>(&that);