projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Inline Canvases cannot be static or not static as they depends on the layers below.
[synfig.git]
/
synfig-core
/
src
/
synfig
/
layer.cpp
diff --git
a/synfig-core/src/synfig/layer.cpp
b/synfig-core/src/synfig/layer.cpp
index
9d1adf3
..
2a5a90b
100644
(file)
--- a/
synfig-core/src/synfig/layer.cpp
+++ b/
synfig-core/src/synfig/layer.cpp
@@
-136,7
+136,8
@@
Layer::subsys_stop()
Layer::Layer():
active_(true),
z_depth_(0.0f),
Layer::Layer():
active_(true),
z_depth_(0.0f),
- dirty_time_(Time::end())
+ dirty_time_(Time::end()),
+ z_depth_static(false)
{
_LayerCounter::counter++;
}
{
_LayerCounter::counter++;
}
@@
-292,14
+293,35
@@
Layer::on_changed()
bool
Layer::set_param(const String ¶m, const ValueBase &value)
{
bool
Layer::set_param(const String ¶m, const ValueBase &value)
{
-
if(param=="z_depth" && value.same_type_as(z_depth_))
+
/*
if(param=="z_depth" && value.same_type_as(z_depth_))
{
z_depth_=value.get(z_depth_);
{
z_depth_=value.get(z_depth_);
+ set_param_static(param, value.get_static());
return true;
}
return true;
}
+ */
+ IMPORT_AS(z_depth_,"z_depth")
return false;
}
return false;
}
+bool
+Layer::set_param_static(const String ¶m, const bool x)
+{
+ SET_STATIC(z_depth,x)
+
+ return false;
+}
+
+
+bool
+Layer::get_param_static(const String ¶m) const
+{
+ GET_STATIC(z_depth);
+
+ return false;
+}
+
+
etl::handle<Transform>
Layer::get_transform()const
{
etl::handle<Transform>
Layer::get_transform()const
{
@@
-449,8
+471,11
@@
ValueBase
Layer::get_param(const String & param)const
{
if(param=="z_depth")
Layer::get_param(const String & param)const
{
if(param=="z_depth")
- return get_z_depth();
-
+ {
+ synfig::ValueBase ret(get_z_depth());
+ ret.set_static(z_depth_static);
+ return ret;
+ }
return ValueBase();
}
return ValueBase();
}