X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Fsrc%2Fsynfigapp%2Factions%2Fvaluedescexport.cpp;h=b9fedcb570dff7b3509554572a21ea059cc055e3;hb=d43ed398fd84b93b96eb91d91dafdf65c80537e6;hp=65252cfac62763423b9b1395ccd3720134163b46;hpb=a095981e18cc37a8ecc7cd237cc22b9c10329264;p=synfig.git diff --git a/synfig-studio/src/synfigapp/actions/valuedescexport.cpp b/synfig-studio/src/synfigapp/actions/valuedescexport.cpp index 65252cf..b9fedcb 100644 --- a/synfig-studio/src/synfigapp/actions/valuedescexport.cpp +++ b/synfig-studio/src/synfigapp/actions/valuedescexport.cpp @@ -104,20 +104,19 @@ Action::ValueDescExport::is_candidate(const ParamList &x) if(candidate_check(get_param_vocab(),x)) { ValueDesc value_desc=x.find("value_desc")->second.get_value_desc(); - if(!value_desc || - value_desc.parent_is_canvas() || - (value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) || - (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && !value_desc.get_value().get(Canvas::Handle())->is_inline())) + if(!value_desc) + return false; + if(value_desc.get_value_type()==ValueBase::TYPE_CANVAS) + if(!value_desc.get_value().get(Canvas::Handle())) + return false; + if( + value_desc.parent_is_canvas() + || + (value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) + || + (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && !value_desc.get_value().get(Canvas::Handle())->is_inline()) + ) { -// if (!value_desc) -// synfig::info("%s:%d no export because no value_desc", __FILE__, __LINE__); -// else if (value_desc.parent_is_canvas()) -// synfig::info("%s:%d no export because parent is canvas", __FILE__, __LINE__); -// else if (value_desc.is_value_node() && value_desc.get_value_node()->is_exported()) -// synfig::info("%s:%d no export because exported value node", __FILE__, __LINE__); -// else if (value_desc.get_value_type()==ValueBase::TYPE_CANVAS && !value_desc.get_value().get(Canvas::Handle())->is_inline()) -// synfig::info("%s:%d no export because canvas isn't inline", __FILE__, __LINE__); - return false; } return true;