projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set the canvas of the bline used by the circle tool.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer_solidcolor.cpp
diff --git
a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp
b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp
index
a0358f9
..
0b520ad
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer_solidcolor.cpp
+++ b/
synfig-core/trunk/src/synfig/layer_solidcolor.cpp
@@
-1,11
+1,12
@@
/* === S Y N F I G ========================================================= */
/*! \file layer_solidcolor.cpp
/* === S Y N F I G ========================================================= */
/*! \file layer_solidcolor.cpp
-** \brief
Template Head
er
+** \brief
Implementation of the "Solid Color" lay
er
**
** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** 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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-51,8
+52,8
@@
using namespace synfig;
SYNFIG_LAYER_INIT(Layer_SolidColor);
SYNFIG_LAYER_SET_NAME(Layer_SolidColor,"SolidColor"); // todo: use solid_color
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$");
SYNFIG_LAYER_SET_VERSION(Layer_SolidColor,"0.1");
SYNFIG_LAYER_SET_CVS_ID(Layer_SolidColor,"$Id$");
@@
-71,7
+72,9
@@
Layer_SolidColor::Layer_SolidColor():
bool
Layer_SolidColor::set_param(const String & param, const ValueBase &value)
{
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);
}
return Layer_Composite::set_param(param,value);
}