X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.cpp;h=cd137cb536aa99fa7dbf4e516885d13d304ec94f;hb=9ec7171ff045c2ef22e40adc882a8efac3ee09b7;hp=a8b42197ddb0304ee7a3a574736ec35ac88ab26d;hpb=d33059aae9748036c993c319e998b078124705d1;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index a8b4219..cd137cb 100644
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 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
@@ -556,8 +556,8 @@ Duckmatic::signal_edited_selected_ducks()
 				throw String("Bad edit");
 			}
 		}
-#ifdef RESTRICT_RADIUS_DUCKS_TO_ONE_QUARTER
-		else if ((*iter)->is_radius())
+		else if (App::restrict_radius_ducks &&
+				 (*iter)->is_radius())
 		{
 			Point point((*iter)->get_point());
 			bool changed = false;
@@ -581,7 +581,6 @@ Duckmatic::signal_edited_selected_ducks()
 				throw String("Bad edit");
 			}
 		}
-#endif
 		else
 		{
 			if(!(*iter)->signal_edited()((*iter)->get_point()))
@@ -775,6 +774,8 @@ Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type)
 
 		if(duck->get_type()&Duck::TYPE_VERTEX)
 			dist*=1.0001;
+		else if(duck->get_type()&Duck::TYPE_RADIUS)
+			dist*=0.9999;
 
 		if(dist<=closest && !( duck->get_type() && (!(type & duck->get_type())) ) )
 		{