projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use <= when comparing distances to give priority to the uppermost duck in the event...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
layer.cpp
diff --git
a/synfig-core/trunk/src/synfig/layer.cpp
b/synfig-core/trunk/src/synfig/layer.cpp
index
9a5bf2c
..
7643883
100644
(file)
--- a/
synfig-core/trunk/src/synfig/layer.cpp
+++ b/
synfig-core/trunk/src/synfig/layer.cpp
@@
-304,18
+304,20
@@
Layer::get_z_depth(const synfig::Time& t)const
return (*dynamic_param_list().find("z_depth")->second)(t).get(Real());
}
return (*dynamic_param_list().find("z_depth")->second)(t).get(Real());
}
-#ifdef THIS_CODE_IS_NOT_USED
-Layer*
+Layer::Handle
Layer::simple_clone()const
{
if(!book().count(get_name())) return 0;
Layer::simple_clone()const
{
if(!book().count(get_name())) return 0;
- Layer *ret = create(get_name()).get();
- ret->set_canvas(get_canvas());
+ Handle ret = create(get_name()).get();
+ ret->group_=group_;
+ //ret->set_canvas(get_canvas());
ret->set_description(get_description());
ret->set_description(get_description());
+ ret->set_active(active());
ret->set_param_list(get_param_list());
ret->set_param_list(get_param_list());
+ for(DynamicParamList::const_iterator iter=dynamic_param_list().begin();iter!=dynamic_param_list().end();++iter)
+ ret->connect_dynamic_param(iter->first, iter->second);
return ret;
}
return ret;
}
-#endif /* THIS_CODE_IS_NOT_USED */
Layer::Handle
Layer::clone(const GUID& deriv_guid) const
Layer::Handle
Layer::clone(const GUID& deriv_guid) const