X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_curves.cpp;h=cef497781cd32b5d069e19b6171137675ebb5805;hb=81ac86316ac4a4d5c54e859311a7f792613b2d33;hp=08a8a14f5896dfd8388713c1df9cd4291f06df05;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp index 08a8a14..cef4977 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp @@ -38,6 +38,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -223,7 +225,6 @@ struct studio::Widget_Curves::CurveStruct : sigc::trackable void clear_all_values() { - DEBUGPOINT(); std::vector::iterator iter; for(iter=channels.begin();iter!=channels.end();++iter) iter->values.clear(); @@ -288,6 +289,12 @@ struct studio::Widget_Curves::CurveStruct : sigc::trackable return -channels[chan].values[time]; } + + static bool is_not_supported(const synfigapp::ValueDesc& x) + { + return x.get_value_type() == ValueBase::TYPE_STRING + || x.get_value_type() == ValueBase::TYPE_CANVAS; + } }; /* === M E T H O D S ======================================================= */ @@ -364,11 +371,13 @@ Widget_Curves::set_value_descs(std::list value_descs) std::list::iterator iter; for(iter=value_descs.begin();iter!=value_descs.end();++iter) { + if (CurveStruct::is_not_supported(*iter)) + continue; + try { curve_list_.push_back(*iter); if(iter->is_value_node()) { - DEBUGPOINT(); iter->get_value_node()->signal_changed().connect( sigc::mem_fun( *this, @@ -378,7 +387,6 @@ Widget_Curves::set_value_descs(std::list value_descs) } if(iter->parent_is_value_node()) { - DEBUGPOINT(); iter->get_parent_value_node()->signal_changed().connect( sigc::mem_fun( *this, @@ -388,7 +396,6 @@ Widget_Curves::set_value_descs(std::list value_descs) } if(iter->parent_is_layer_param()) { - DEBUGPOINT(); iter->get_layer()->signal_changed().connect( sigc::mem_fun( *this,