X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=6619719e16f4184e1c9d6857f22885636a7be3aa;hb=4c343e415bc02343d7b65322240fe758a1d992e4;hp=06776693fc38cb68c1315b9b4b39affe0ffd23a0;hpb=4bdf78b11b50c9b9465828c0a7fbc248472a9bf9;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 0677669..6619719 100644
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@ -41,6 +41,7 @@
 #include <synfig/valuenode_reference.h>
 #include <synfig/valuenode_twotone.h>
 #include <synfig/valuenode_stripes.h>
+#include <synfig/valuenode_bline.h>
 
 #include <synfig/waypoint.h>
 #include <synfig/loadcanvas.h>
@@ -234,9 +235,30 @@ CanvasInterface::add_layer_to(synfig::String name, synfig::Canvas::Handle canvas
 		{
 			ValueNode::Handle value_node;
 
-			// if we find any which are list values then make them into dynamic list valuenodes
+			// if we find any which are list values then make them
+			// into dynamic list valuenodes, unless every element of
+			// the list is a blinepoint, in which case convert it to a
+			// bline
 			if(iter->second.get_type()==ValueBase::TYPE_LIST)
-				value_node=LinkableValueNode::create("dynamic_list",iter->second);
+			{
+				// check whether it's a list of blinepoints only
+				vector<ValueBase> list(iter->second.get_list());
+				if (list.size())
+				{
+					vector<ValueBase>::iterator iter2;
+					for (iter2 = list.begin(); iter2 != list.end(); iter2++)
+						if (iter2->get_type() != ValueBase::TYPE_BLINEPOINT)
+							break;
+					if (iter2 == list.end())
+					{
+						value_node=LinkableValueNode::create("bline",iter->second);
+						ValueNode_BLine::Handle::cast_dynamic(value_node)->set_member_canvas(canvas);
+					}
+				}
+
+				if (!value_node)
+					value_node=LinkableValueNode::create("dynamic_list",iter->second);
+			}
 			// otherwise, if it's a type that can be converted to
 			// 'composite' (other than the types that can be radial
 			// composite) then do so
@@ -731,19 +753,22 @@ CanvasInterface::change_value(synfigapp::ValueDesc value_desc,synfig::ValueBase
 		return true;
 
 	// If this change needs to take place elsewhere, then so be it.
-	if(value_desc.get_canvas() && value_desc.get_canvas()->get_root()!=get_canvas()->get_root())do
+	if(value_desc.get_canvas())
 	{
-		etl::handle<Instance> instance;
-		instance=find_instance(value_desc.get_canvas()->get_root());
-
-		if(instance)
-			return instance->find_canvas_interface(value_desc.get_canvas())->change_value(value_desc,new_value);
-		else
+		if (value_desc.get_canvas()->get_root() != get_canvas()->get_root())
 		{
-			get_ui_interface()->error(_("The value you are trying to edit is in a composition\nwhich doesn't seem to be open. Open that composition and you\nshould be able to edit this value as normal."));
-			return false;
+			etl::handle<Instance> instance;
+			instance=find_instance(value_desc.get_canvas()->get_root());
+
+			if(instance)
+				return instance->find_canvas_interface(value_desc.get_canvas())->change_value(value_desc,new_value);
+			else
+			{
+				get_ui_interface()->error(_("The value you are trying to edit is in a composition\nwhich doesn't seem to be open. Open that composition and you\nshould be able to edit this value as normal."));
+				return false;
+			}
 		}
-	}while(0);
+	}
 #ifdef _DEBUG
 	else
 	{ synfig::warning("Can't get canvas from value desc...?"); }