X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_composite.cpp;h=b7880112b75d2ecf6d06132de2ced00d4291ad69;hb=34d470416675482ca866146fd6b3201a19f8e4e6;hp=b22f0697b44493b806c81b575d185293c928f7b2;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_composite.cpp b/synfig-core/trunk/src/synfig/layer_composite.cpp
index b22f069..b788011 100644
--- a/synfig-core/trunk/src/synfig/layer_composite.cpp
+++ b/synfig-core/trunk/src/synfig/layer_composite.cpp
@@ -2,7 +2,7 @@
 /*!	\file layer_composite.cpp
 **	\brief Template File
 **
-**	$Id: layer_composite.cpp,v 1.2 2005/01/24 03:08:18 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -150,11 +150,36 @@ Layer_Composite::get_param_vocab()const
 bool
 Layer_Composite::set_param(const String & param, const ValueBase &value)
 {
-	if(param=="amount" && value.same_as(amount_))
+	if(param=="amount" && value.same_type_as(amount_))
 		amount_=value.get(amount_);
 	else
-	if(param=="blend_method" && value.same_as(int()))
-		blend_method_=static_cast<Color::BlendMethod>(value.get(int()));
+	if(param=="blend_method" && value.same_type_as(int()))
+	{
+		blend_method_ = static_cast<Color::BlendMethod>(value.get(int()));
+
+		if (blend_method_ < 0 || blend_method_ >= Color::BLEND_END)
+		{
+			warning("illegal value (%d) for blend_method - using Composite instead", blend_method_);
+			blend_method_ = Color::BLEND_COMPOSITE;
+			return false;
+		}
+
+		if (blend_method_ == Color::BLEND_STRAIGHT)
+		{
+			Canvas::Handle canvas(get_canvas());
+			if (canvas)
+			{
+				String version(canvas->get_version());
+
+				if (version == "0.1" || version == "0.2")
+					if (get_name() == "PasteCanvas")
+						warning("loaded a version %s canvas with a 'Straight' blended PasteCanvas (%s) - check it renders OK",
+								version.c_str(), get_non_empty_description().c_str());
+					else
+						blend_method_ = Color::BLEND_COMPOSITE;
+			}
+		}
+	}
 	else
 		return Layer::set_param(param,value);
 	return true;