projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use 128x128 default sizes for source icons.
[synfig.git]
/
synfig-core
/
src
/
synfig
/
layer.h
diff --git
a/synfig-core/src/synfig/layer.h
b/synfig-core/src/synfig/layer.h
index
19faddb
..
a867197
100644
(file)
--- a/
synfig-core/src/synfig/layer.h
+++ b/
synfig-core/src/synfig/layer.h
@@
-93,7
+93,7
@@
if (param==y && value.same_type_as(x)) \
{ \
value.put(&x); \
if (param==y && value.same_type_as(x)) \
{ \
value.put(&x); \
- set_param_static(
#x,value.get_static());
\
+ set_param_static(
y,value.get_static());
\
return true; \
}
return true; \
}
@@
-129,7
+129,7
@@
//! This is used as the category for layer book entries which represent aliases of layers.
//! It prevents these layers showing up in the menu.
#define CATEGORY_DO_NOT_USE "Do Not Use"
//! This is used as the category for layer book entries which represent aliases of layers.
//! It prevents these layers showing up in the menu.
#define CATEGORY_DO_NOT_USE "Do Not Use"
-
+/*
//! x=variable name, y=static bool value
#define SET_STATIC(x,y) \
if(param==#x && x ## _static != y) \
//! x=variable name, y=static bool value
#define SET_STATIC(x,y) \
if(param==#x && x ## _static != y) \
@@
-141,7
+141,7
@@
#define GET_STATIC(x) \
if(param==#x) \
return x ## _static; \
#define GET_STATIC(x) \
if(param==#x) \
return x ## _static; \
-
+*/
/* === T Y P E D E F S ===================================================== */
/* === T Y P E D E F S ===================================================== */
@@
-273,7
+273,6
@@
private:
float z_depth;
//! True if zdepth is not affected when in animation mode
float z_depth;
//! True if zdepth is not affected when in animation mode
- //bool z_depth_static;
typedef std::map<String, bool> Sparams;
Sparams static_params;
typedef std::map<String, bool> Sparams;
Sparams static_params;
@@
-472,6
+471,7
@@
public:
virtual bool set_param_static(const String ¶m, const bool x);
virtual bool get_param_static(const String ¶m) const;
virtual bool set_param_static(const String ¶m, const bool x);
virtual bool get_param_static(const String ¶m) const;
+ virtual void fill_static(Vocab vocab);
//! Sets a list of parameters
virtual bool set_param_list(const ParamList &);
//! Sets a list of parameters
virtual bool set_param_list(const ParamList &);