projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove .gitignore do nothing is ignored.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_geometry
/
region.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_geometry/region.cpp
b/synfig-core/trunk/src/modules/mod_geometry/region.cpp
index
75a9a1e
..
462d30e
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_geometry/region.cpp
+++ b/
synfig-core/trunk/src/modules/mod_geometry/region.cpp
@@
-1,11
+1,12
@@
/* === S Y N F I G ========================================================= */
/*! \file region.cpp
/* === S Y N F I G ========================================================= */
/*! \file region.cpp
-** \brief
Template Head
er
+** \brief
Implementation of the "Region" 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
@@
-59,8
+60,8
@@
using namespace etl;
SYNFIG_LAYER_INIT(Region);
SYNFIG_LAYER_SET_NAME(Region,"region");
SYNFIG_LAYER_INIT(Region);
SYNFIG_LAYER_SET_NAME(Region,"region");
-SYNFIG_LAYER_SET_LOCAL_NAME(Region,_("Region"));
-SYNFIG_LAYER_SET_CATEGORY(Region,_("Geometry"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Region,
N
_("Region"));
+SYNFIG_LAYER_SET_CATEGORY(Region,
N
_("Geometry"));
SYNFIG_LAYER_SET_VERSION(Region,"0.1");
SYNFIG_LAYER_SET_CVS_ID(Region,"$Id$");
SYNFIG_LAYER_SET_VERSION(Region,"0.1");
SYNFIG_LAYER_SET_CVS_ID(Region,"$Id$");
@@
-93,9
+94,9
@@
void
Region::sync()
{
if(bline.get_contained_type()==ValueBase::TYPE_BLINEPOINT)
Region::sync()
{
if(bline.get_contained_type()==ValueBase::TYPE_BLINEPOINT)
- {
segment_list=convert_bline_to_segment_list(bline);
segment_list=convert_bline_to_segment_list(bline);
- }
+ else if(bline.get_contained_type()==ValueBase::TYPE_SEGMENT)
+ segment_list=vector<synfig::Segment>(bline.get_list().begin(), bline.get_list().end());
else
{
synfig::warning("Region: incorrect type on bline, layer disabled");
else
{
synfig::warning("Region: incorrect type on bline, layer disabled");
@@
-229,7
+230,7
@@
Region::get_param_vocab()const
ret.push_back(ParamDesc("bline")
.set_local_name(_("Vertices"))
ret.push_back(ParamDesc("bline")
.set_local_name(_("Vertices"))
- .set_origin("o
ffset
")
+ .set_origin("o
rigin
")
);
return ret;
);
return ret;