X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_bline.cpp;h=f1f2221b947781de5cd70349ad1c84659878599b;hb=a1373cb0b813709f46c5d688b554ef5db7ea59ff;hp=0a010f19484cbb1e7aea60f209dbaa09caf57575;hpb=756c0d29ac1742f231e6615f9a577e574e35a4af;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
index 0a010f1..f1f2221 100644
--- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp
@@ -64,6 +64,9 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
+// if defined, show the first duck as green while drawing
+//#define DISTINGUISH_FIRST_DUCK
+
 /* === G L O B A L S ======================================================= */
 
 StateBLine studio::state_bline;
@@ -988,7 +991,12 @@ StateBLine_Context::refresh_ducks(bool button_down)
 		// First add the duck associated with this vertex
 		duck=new WorkArea::Duck(bline_point.get_vertex());
 		duck->set_editable(true);
+#ifdef DISTINGUISH_FIRST_DUCK
+		if (iter!=bline_point_list.begin())
+			duck->set_type(Duck::TYPE_VERTEX);
+#else
 		duck->set_type(Duck::TYPE_VERTEX);
+#endif
 		duck->set_name(strprintf("%x-vertex",value_node.get()));
 		duck->signal_edited().connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_vertex_change),value_node)
@@ -1091,6 +1099,9 @@ StateBLine_Context::refresh_ducks(bool button_down)
 
 		duck=new WorkArea::Duck(bline_point.get_vertex());
 		duck->set_editable(true);
+#ifndef DISTINGUISH_FIRST_DUCK
+		duck->set_type(Duck::TYPE_VERTEX);
+#endif
 		duck->set_name(strprintf("%x-vertex",bline_point_list.front().get()));
 		duck->signal_edited().connect(
 			sigc::bind(sigc::mem_fun(*this,&studio::StateBLine_Context::on_vertex_change),bline_point_list.front())
@@ -1134,12 +1145,12 @@ StateBLine_Context::refresh_ducks(bool button_down)
 	if(bezier && !loop_)
 	{
 		duck=new WorkArea::Duck(bline_point.get_vertex());
-		duck->set_editable(false);
+		duck->set_ignore(true);
 		duck->set_name("temp");
 
 		// Add the tangent1 duck
 		tduck=new WorkArea::Duck(Vector(0,0));
-		tduck->set_editable(false);
+		tduck->set_ignore(true);
 		tduck->set_name("ttemp");
 		tduck->set_origin(duck);
 		tduck->set_scalar(-0.33333333333333333);
@@ -1271,27 +1282,24 @@ StateBLine_Context::bline_insert_vertex(synfig::ValueNode_Const::Handle value_no
 	for(iter=bline_point_list.begin();iter!=bline_point_list.end();++iter)
 		if(*iter==value_node)
 		{
-			list<ValueNode_Const::Handle>::iterator prev(iter);
-			--prev;
-
 			BLinePoint bline_point;
-
 			BLinePoint next_bline_point((*iter)->get_value().get(BLinePoint()));
 			BLinePoint prev_bline_point;
 
-			if(iter!=bline_point_list.begin())
-			{
-				prev_bline_point=(*prev)->get_value().get(BLinePoint());
-			}
-			else
+			list<ValueNode_Const::Handle>::iterator prev(iter);
+			if(iter==bline_point_list.begin())
 			{
-				prev_bline_point.set_vertex(Point(0,0));
-				prev_bline_point.set_width(next_bline_point.get_width());
-				prev_bline_point.set_origin(0.5);
-				prev_bline_point.set_split_tangent_flag(false);
+				assert(loop_);
+				prev = bline_point_list.end();
 			}
+			prev--;
+
+			prev_bline_point=(*prev)->get_value().get(BLinePoint());
 
-			etl::hermite<Vector> curve(prev_bline_point.get_vertex(),next_bline_point.get_vertex(),prev_bline_point.get_tangent2(),next_bline_point.get_tangent1());
+			etl::hermite<Vector> curve(prev_bline_point.get_vertex(),
+									   next_bline_point.get_vertex(),
+									   prev_bline_point.get_tangent2(),
+									   next_bline_point.get_tangent1());
 			etl::derivative< etl::hermite<Vector> > deriv(curve);
 
 			bline_point.set_vertex(curve(origin));