X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fstate_draw.cpp;h=8bda933e37e12976d31ccb771bff5ab111791b2d;hb=63e709f66d50c124cc0ece2325f4773ac4ae7b20;hp=9782f913bf740d9b4c20f0d60ec04c22e9eec1b7;hpb=2f0a8aac28d9601ad0cd269ec662b4e09801e614;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index 9782f91..8bda933 100644
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -62,6 +62,8 @@
 #include <gtkmm/scale.h>
 #include <sigc++/connection.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -97,7 +99,7 @@ class studio::StateDraw_Context : public sigc::trackable
 	bool prev_workarea_layer_status_;
 
 	int nested;
-	SigC::Connection process_queue_connection;
+	sigc::connection process_queue_connection;
 
 	ValueNode_BLine::Handle last_stroke;
 	synfig::String last_stroke_id;
@@ -1520,7 +1522,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 				  if(value_prev.get_parent_value_node()==value_next.get_parent_value_node() &&
 				  value_prev.get_parent_value_node()!=value_desc.get_parent_value_node())
 				  {
-				  DEBUGPOINT();
 				  vertex_list.erase(iter);
 				  done=false;
 				  break;
@@ -1535,7 +1536,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 				// if(value_prev.get_value_node()==value_desc.get_value_node() ||
 				//    value_desc.get_value_node()==value_next.get_value_node())
 				// {
-				// 	// DEBUGPOINT();
 				//	vertex_list.erase(iter);
 				//	done=false;
 				//	printf("erased node - i = %d\n", i);
@@ -1545,7 +1545,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 				// // if previous is the same as next, remove previous?  or next?
 				// if(value_prev.get_value_node()==value_next.get_value_node())
 				// {
-				// 	// DEBUGPOINT();
 				// 	vertex_list.erase(next);
 				// 	// vertex_list.erase(prev);
 				// 	done=false;
@@ -1574,7 +1573,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 						// 							   strprintf("same parent, different points this %d < next-1 %d",
 						// 										 value_desc.get_index(), ((value_next.get_index()-1))),
 						// 							   current);
-						// 		// DEBUGPOINT();
 						// 		for (int index = value_desc.get_index()+1; index < value_next.get_index(); index++)
 						// 		{
 						// 			printf("inserting up %d\n", index);
@@ -1590,7 +1588,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 						// 							   strprintf("same parent, different points next %d < this-1 %d",
 						// 										 value_next.get_index(), ((value_desc.get_index()-1))),
 						// 							   current);
-						// 		// DEBUGPOINT();
 						// 		for (int index = value_desc.get_index()-1; index > value_next.get_index(); index--)
 						// 		{
 						// 			printf("inserting down %d\n", index);
@@ -1630,7 +1627,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 							if((vertex.get_vertex()-vertex_next.get_vertex()).mag_squared()<radius*radius)
 							{
 								printf("in one - it's close\n");
-								// DEBUGPOINT();
 								ValueNode_Composite::Handle value_node;
 								ValueNode_Composite::Handle value_node_next;
 								value_node=ValueNode_Composite::Handle::cast_dynamic(value_desc.get_value_node().clone());
@@ -1640,7 +1636,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 									synfig::info(__FILE__":%d: Unable to properly connect blines.",__LINE__);
 									continue;
 								}
-								// DEBUGPOINT();
 								// \todo if next isn't split, don't we want to copy its 'Tangent 1' instead?
 								value_node->set_link(5,value_node_next->get_link(5)); // Tangent 2
 								value_node->set_link(3,ValueNode_Const::create(true)); // Split Tangents
@@ -1661,7 +1656,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 							else if (value_prev.parent_is_value_node())
 							{
 								printf("in two - it's far\n");
-								// DEBUGPOINT();
 								// \todo this only makes sense if prev is on the same bline
 								printf("this is index %d\n", value_desc.get_index());
 								printf("prev is index %d\n", value_prev.get_index());
@@ -1677,7 +1671,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 									if (value_desc.get_index()<LinkableValueNode::Handle::cast_static(value_desc.get_parent_value_node())->link_count()-1)
 									{
 										printf("in two - b\n");
-										// DEBUGPOINT();
 										printf("inserting node with index %d\n", value_desc.get_index()+1);
 										vertex_list.insert(next,
 														   synfigapp::ValueDesc(value_desc.get_parent_value_node(),
@@ -1692,7 +1685,6 @@ StateDraw_Context::new_region(std::list<synfig::BLinePoint> bline, synfig::Real
 									if(value_desc.get_index()>0)
 									{
 										printf("in two - a\n");
-										// DEBUGPOINT();
 										printf("inserting node on this line with index %d\n",
 											   value_desc.get_index()-1);
 										vertex_list.insert(next,