projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'genete_static_values'
[synfig.git]
/
synfig-core
/
src
/
modules
/
mod_gradient
/
lineargradient.cpp
diff --git
a/synfig-core/src/modules/mod_gradient/lineargradient.cpp
b/synfig-core/src/modules/mod_gradient/lineargradient.cpp
index
be7155a
..
c47ffad
100644
(file)
--- a/
synfig-core/src/modules/mod_gradient/lineargradient.cpp
+++ b/
synfig-core/src/modules/mod_gradient/lineargradient.cpp
@@
-69,6
+69,7
@@
LinearGradient::sync()
LinearGradient::LinearGradient():
LinearGradient::LinearGradient():
+ Layer_Composite(1.0,Color::BLEND_COMPOSITE),
p1(1,1),
p2(-1,-1),
gradient(Color::black(), Color::white()),
p1(1,1),
p2(-1,-1),
gradient(Color::black(), Color::white()),
@@
-76,6
+77,8
@@
LinearGradient::LinearGradient():
zigzag(false)
{
sync();
zigzag(false)
{
sync();
+ Layer::Vocab voc(get_param_vocab());
+ Layer::fill_static(voc);
}
inline Color
}
inline Color
@@
-141,12
+144,14
@@
LinearGradient::set_param(const String & param, const ValueBase &value)
if(param=="p1" && value.same_type_as(p1))
{
p1=value.get(p1);
if(param=="p1" && value.same_type_as(p1))
{
p1=value.get(p1);
+ set_param_static(param, value.get_static());
sync();
return true;
}
if(param=="p2" && value.same_type_as(p2))
{
p2=value.get(p2);
sync();
return true;
}
if(param=="p2" && value.same_type_as(p2))
{
p2=value.get(p2);
+ set_param_static(param, value.get_static());
sync();
return true;
}
sync();
return true;
}