Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / synfig / layer_solidcolor.cpp

diff --git a/synfig-core/tags/stable/src/synfig/layer_solidcolor.cpp b/synfig-core/tags/stable/src/synfig/layer_solidcolor.cpp
index c92148c..0b520ad 100644 (file)
--- a/synfig-core/tags/stable/src/synfig/layer_solidcolor.cpp
+++ b/synfig-core/tags/stable/src/synfig/layer_solidcolor.cpp
@@ -1,12 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file layer_solidcolor.cpp
-**     \brief Template Header
+**     \brief Implementation of the "Solid Color" layer
 **
 **     $Id$
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**     Copyright (c) 2007 Chris Moore
+**     Copyright (c) 2007, 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -52,8 +52,8 @@ using namespace synfig;
 
 SYNFIG_LAYER_INIT(Layer_SolidColor);
 SYNFIG_LAYER_SET_NAME(Layer_SolidColor,"SolidColor"); // todo: use solid_color
-SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SolidColor,_("Solid Color"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_SolidColor,_("Geometry"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SolidColor,N_("Solid Color"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_SolidColor,N_("Geometry"));
 SYNFIG_LAYER_SET_VERSION(Layer_SolidColor,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(Layer_SolidColor,"$Id$");
 
@@ -72,7 +72,9 @@ Layer_SolidColor::Layer_SolidColor():
 bool
 Layer_SolidColor::set_param(const String & param, const ValueBase &value)
 {
-       IMPORT(color);
+       IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
+                                       set_blend_method(Color::BLEND_ALPHA_OVER);
+                                       color.set_a(1); } else transparent_color_ = true; } });
 
        return Layer_Composite::set_param(param,value);
 }