X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_dynamiclist.cpp;h=ddcca6d46308a896893be6bb3d0d1cdfa3189379;hb=46c511f599eb007df388362aa9553aeb25421bad;hp=a0d3f79ee32cc1edd70d9a8448eeb0989ef8dff6;hpb=c6b0c050710376d3cf99b7c083a7c47f1a0516c9;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp index a0d3f79..ddcca6d 100644 --- a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp @@ -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 @@ -576,6 +577,12 @@ ValueNode_DynamicList::create_from(const ValueBase &value) ValueNode_DynamicList* value_node(new ValueNode_DynamicList(value_list.front().get_type())); + // when creating a list of vectors, start it off being looped. + // I think the only time this is used if for creating polygons, + // and we want them to be looped by default + if (value_node->get_contained_type() == ValueBase::TYPE_VECTOR) + value_node->set_loop(true); + for(iter=value_list.begin();iter!=value_list.end();++iter) { ValueNode::Handle item(ValueNode_Const::create(*iter)); @@ -659,7 +666,7 @@ ValueNode_DynamicList::clone(const GUID& deriv_guid)const { { ValueNode* x(find_value_node(get_guid()^deriv_guid).get()); if(x)return x; } - ValueNode_DynamicList* ret=new ValueNode_DynamicList(container_type); + ValueNode_DynamicList* ret=dynamic_cast(create_new()); ret->set_guid(get_guid()^deriv_guid); std::vector::const_iterator iter; @@ -673,7 +680,7 @@ ValueNode_DynamicList::clone(const GUID& deriv_guid)const ListEntry list_entry(*iter); //list_entry.value_node=find_value_node(iter->value_node->get_guid()^deriv_guid).get(); //if(!list_entry.value_node) - list_entry.value_node=iter->value_node->clone(deriv_guid); + list_entry.value_node=iter->value_node->clone(deriv_guid); ret->add(list_entry); //ret->list.back().value_node=iter->value_node.clone(); } @@ -712,6 +719,13 @@ ValueNode_DynamicList::check_type(ValueBase::Type type) return type==ValueBase::TYPE_LIST; } +void +ValueNode_DynamicList::set_member_canvas(etl::loose_handle canvas) +{ + for (vector::iterator iter = list.begin(); iter != list.end(); iter++) + iter->value_node->set_parent_canvas(canvas); +} + ValueBase::Type ValueNode_DynamicList::get_contained_type()const { @@ -721,9 +735,7 @@ ValueNode_DynamicList::get_contained_type()const LinkableValueNode* ValueNode_DynamicList::create_new()const { - assert(0); - - return 0; + return new ValueNode_DynamicList(container_type); } int