Merged behaviour from ContourMask into AlphaMask.

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1181 0fc631ac-6414-0410-93d0-97cfa31319b6

src/data/field/choice.cpp

@@ -214,8 +214,11 @@ void ChoiceStyle::initImage() {
 int ChoiceStyle::update(Context& ctx) {
 	// Don't update the choice images, leave that to invalidate()
 	int change = Style       ::update(ctx)
-	           | font         .update(ctx) * CHANGE_OTHER
-	           | mask_filename.update(ctx) * CHANGE_MASK;
+	           | font         .update(ctx) * CHANGE_OTHER;
+	if (mask_filename.update(ctx)) {
+		change |= CHANGE_MASK;
+		mask = Image();
+	}
 	if (!choice_images_initialized) {
 		// we only want to do this once because it is rather slow, other updates are handled by dependencies
 		choice_images_initialized = true;

src/data/field/text.hpp

@@ -68,7 +68,7 @@ class TextStyle : public Style {
 	double line_height_line_max;				///< Maximum line height
 	double paragraph_height;					///< Fixed height of paragraphs
 	String mask_filename;						///< Filename of the mask
-	ContourMask mask;							///< Mask to fit the text to (may be null)
+	AlphaMask mask;								///< Mask to fit the text to (may be null)
 	Direction direction;						///< In what direction is text layed out?
 	// information from text rendering
 	double content_width, content_height;		///< Size of the rendered text