X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fvalue_desc.h;h=841b40ecfafac234a98582ebfa59596fe5b1cf82;hb=edbf9f94aa503e33a27e40701b67221f3ade5f3e;hp=5e7a73adf6494fdbd5b01f9975758846b1fe3ad3;hpb=14584123d5a0026ecc586d9aa4b34084651a626b;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/value_desc.h b/synfig-studio/trunk/src/synfigapp/value_desc.h index 5e7a73a..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,8 +144,10 @@ 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; } @@ -152,7 +155,7 @@ public: get_value(synfig::Time time=0)const { // if the value is constant, return that constant value (at *any* time, it doesn't matter which) - if(parent_is_value_node_const() && parent_value_node) + if(parent_is_value_node_const()) return (*parent_value_node)(0); if(is_value_node() && get_value_node()) return (*get_value_node())(time);