projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
canvastreestore.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
index
e597de2
..
d9bacd3
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/canvastreestore.cpp
@@
-31,7
+31,7
@@
#include "canvastreestore.h"
#include <synfig/valuenode.h>
#include "canvastreestore.h"
#include <synfig/valuenode.h>
-#include "iconcontroler.h"
+#include "iconcontrol
l
er.h"
#include <synfig/valuenode_timedswap.h>
#include <synfig/valuenode_animated.h>
#include <gtkmm/button.h>
#include <synfig/valuenode_timedswap.h>
#include <synfig/valuenode_animated.h>
#include <gtkmm/button.h>
@@
-40,6
+40,8
@@
#include "cellrenderer_timetrack.h"
#include <ETL/clock>
#include "cellrenderer_timetrack.h"
#include <ETL/clock>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-204,7
+206,7
@@
CanvasTreeStore::get_value_vfunc(const Gtk::TreeModel::iterator& iter, int colum
{
if(!value_desc.is_value_node() || value_desc.get_value_node()->get_name()=="constant")
{
{
if(!value_desc.is_value_node() || value_desc.get_value_node()->get_name()=="constant")
{
- x.set(ValueBase::type_name(value_desc.get_value_type()));
+ x.set(ValueBase::type_
local_
name(value_desc.get_value_type()));
}
else
{
}
else
{
@@
-327,7
+329,7
@@
CanvasTreeStore::find_next_value_desc(const synfigapp::ValueDesc& value_desc, Gt
}
bool
}
bool
-CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter)
+CanvasTreeStore::find_first_value_node(const
synfig::
ValueNode::Handle& value_node, Gtk::TreeIter& iter)
{
iter=children().begin();
while(iter && value_node!=(ValueNode::Handle)(*iter)[model.value_node])
{
iter=children().begin();
while(iter && value_node!=(ValueNode::Handle)(*iter)[model.value_node])
@@
-351,7
+353,7
@@
CanvasTreeStore::find_first_value_node(const ValueNode::Handle& value_node, Gtk:
}
bool
}
bool
-CanvasTreeStore::find_next_value_node(const ValueNode::Handle& value_node, Gtk::TreeIter& iter)
+CanvasTreeStore::find_next_value_node(const
synfig::
ValueNode::Handle& value_node, Gtk::TreeIter& iter)
{
if(!iter) return find_first_value_node(value_node,iter);
{
if(!iter) return find_first_value_node(value_node,iter);