X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fvalue_desc.h;h=841b40ecfafac234a98582ebfa59596fe5b1cf82;hb=edbf9f94aa503e33a27e40701b67221f3ade5f3e;hp=d7767d388f6f51e2ecab413b7a82f9b10eb2b340;hpb=b0f748aba0e380b4b9bb0ebcc4066cc3499aecd7;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/value_desc.h b/synfig-studio/trunk/src/synfigapp/value_desc.h index d7767d3..841b40e 100644 --- a/synfig-studio/trunk/src/synfigapp/value_desc.h +++ b/synfig-studio/trunk/src/synfigapp/value_desc.h @@ -6,6 +6,7 @@ ** ** \legal ** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley +** Copyright (c) 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 @@ -143,16 +144,18 @@ public: if(parent_is_layer_param() && layer->dynamic_param_list().count(name)) return layer->dynamic_param_list().find(name)->second; if(parent_is_linkable_value_node()) - return synfig::LinkableValueNode::Handle::cast_reinterpret(parent_value_node)->get_link(index); + return (synfig::LinkableValueNode::Handle::cast_reinterpret(parent_value_node))->get_link(index); // return reinterpret_cast(parent_value_node.get())->get_link(index); + if(parent_is_value_node_const()) + return parent_value_node; return 0; } synfig::ValueBase get_value(synfig::Time time=0)const { - if(parent_is_value_node_const() && parent_value_node) - // \todo "(*parent_value_node)(0)"? shouldn't that be "(*parent_value_node)(time)"? + // if the value is constant, return that constant value (at *any* time, it doesn't matter which) + if(parent_is_value_node_const()) return (*parent_value_node)(0); if(is_value_node() && get_value_node()) return (*get_value_node())(time); @@ -177,7 +180,7 @@ public: } synfig::String - get_description()const; + get_description(bool show_exported_name = true)const; }; // END of class ValueDesc }; // END of namespace synfigapp_instance