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-studio
/
trunk
/
src
/
synfigapp
/
actions
/
colorset.h
diff --git
a/synfig-studio/trunk/src/synfigapp/actions/colorset.h
b/synfig-studio/trunk/src/synfigapp/actions/colorset.h
index
6462ffa
..
954b62d
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/actions/colorset.h
+++ b/
synfig-studio/trunk/src/synfigapp/actions/colorset.h
@@
-49,11
+49,11
@@
private:
std::list<ValueDesc> value_desc_list;
synfig::Color color;
synfig::Time time;
std::list<ValueDesc> value_desc_list;
synfig::Color color;
synfig::Time time;
- bool use_
fg
_color;
+ bool use_
outline
_color;
public:
public:
- ColorSet(bool use_
fg
_color);
+ ColorSet(bool use_
outline
_color);
static ParamVocab get_param_vocab();
static bool is_candidate(const ParamList &x);
static ParamVocab get_param_vocab();
static bool is_candidate(const ParamList &x);
@@
-64,21
+64,21
@@
public:
virtual void prepare();
};
virtual void prepare();
};
-class ColorSetFrom
FG
: public ColorSet
+class ColorSetFrom
OC
: public ColorSet
{
public:
{
public:
- ColorSetFrom
FG
() : ColorSet(true) {}
+ ColorSetFrom
OC
() : ColorSet(true) {}
ACTION_MODULE_EXT
};
ACTION_MODULE_EXT
};
-class ColorSetFrom
BG
: public ColorSet
+class ColorSetFrom
FC
: public ColorSet
{
public:
{
public:
- ColorSetFrom
BG
() : ColorSet(false) {}
+ ColorSetFrom
FC
() : ColorSet(false) {}
ACTION_MODULE_EXT
ACTION_MODULE_EXT