projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initialise a couple of values before using them.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_filter
/
halftone3.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
index
3c84432
..
a2a4283
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
+++ b/
synfig-core/trunk/src/modules/mod_filter/halftone3.cpp
@@
-6,7
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-** Copyright (c) 2007 Chris Moore
+** 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
@@
-75,7
+75,7
@@
Halftone3::Halftone3()
{
tone[i].size=size;
tone[i].type=type;
{
tone[i].size=size;
tone[i].type=type;
- tone[i].o
ffset
=(synfig::Point(0,0));
+ tone[i].o
rigin
=(synfig::Point(0,0));
tone[i].angle=Angle::deg(30.0)*(float)i;
}
tone[i].angle=Angle::deg(30.0)*(float)i;
}
@@
-254,13
+254,17
@@
Halftone3::set_param(const String & param, const ValueBase &value)
IMPORT_PLUS(subtractive,sync());
IMPORT(tone[0].angle);
IMPORT_PLUS(subtractive,sync());
IMPORT(tone[0].angle);
- IMPORT(tone[0].o
ffset
);
+ IMPORT(tone[0].o
rigin
);
IMPORT(tone[1].angle);
IMPORT(tone[1].angle);
- IMPORT(tone[1].o
ffset
);
+ IMPORT(tone[1].o
rigin
);
IMPORT(tone[2].angle);
IMPORT(tone[2].angle);
- IMPORT(tone[2].offset);
+ IMPORT(tone[2].origin);
+
+ IMPORT_AS(tone[0].origin,"tone[0].offset");
+ IMPORT_AS(tone[1].origin,"tone[1].offset");
+ IMPORT_AS(tone[2].origin,"tone[2].offset");
return Layer_Composite::set_param(param,value);
}
return Layer_Composite::set_param(param,value);
}
@@
-278,13
+282,13
@@
Halftone3::get_param(const String & param)const
EXPORT(subtractive);
EXPORT(tone[0].angle);
EXPORT(subtractive);
EXPORT(tone[0].angle);
- EXPORT(tone[0].o
ffset
);
+ EXPORT(tone[0].o
rigin
);
EXPORT(tone[1].angle);
EXPORT(tone[1].angle);
- EXPORT(tone[1].o
ffset
);
+ EXPORT(tone[1].o
rigin
);
EXPORT(tone[2].angle);
EXPORT(tone[2].angle);
- EXPORT(tone[2].o
ffset
);
+ EXPORT(tone[2].o
rigin
);
EXPORT_NAME();
EXPORT_VERSION();
EXPORT_NAME();
EXPORT_VERSION();
@@
-321,13
+325,13
@@
Halftone3::get_param_vocab()const
.set_local_name(chan_name+_(" Color"))
);
.set_local_name(chan_name+_(" Color"))
);
- ret.push_back(ParamDesc(strprintf("tone[%d].o
ffset
",i))
- .set_local_name(chan_name+_(" Mask O
ffset
"))
+ ret.push_back(ParamDesc(strprintf("tone[%d].o
rigin
",i))
+ .set_local_name(chan_name+_(" Mask O
rigin
"))
.set_is_distance()
);
ret.push_back(ParamDesc(strprintf("tone[%d].angle",i))
.set_local_name(chan_name+_(" Mask Angle"))
.set_is_distance()
);
ret.push_back(ParamDesc(strprintf("tone[%d].angle",i))
.set_local_name(chan_name+_(" Mask Angle"))
- .set_origin(strprintf("tone[%d].o
ffset
",i))
+ .set_origin(strprintf("tone[%d].o
rigin
",i))
);
}
);
}