projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use <= when comparing distances to give priority to the uppermost duck in the event...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
duckmatic.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index
485b9f6
..
0d88982
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@
-881,8
+881,10
@@
Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type)
{
const Duck::Handle& duck(iter->second);
{
const Duck::Handle& duck(iter->second);
- if(duck->get_ignore())
+ if(duck->get_ignore() ||
+ (duck->get_type() && !(type & duck->get_type())))
continue;
continue;
+
Real dist((duck->get_trans_point()-point).mag_squared());
if(duck->get_type()&Duck::TYPE_VERTEX)
Real dist((duck->get_trans_point()-point).mag_squared());
if(duck->get_type()&Duck::TYPE_VERTEX)
@@
-892,7
+894,7
@@
Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type)
else if(duck->get_type()&Duck::TYPE_RADIUS)
dist*=0.9999;
else if(duck->get_type()&Duck::TYPE_RADIUS)
dist*=0.9999;
- if(dist<
closest && !( duck->get_type() && (!(type & duck->get_type())) )
)
+ if(dist<
=closest
)
{
closest=dist;
ret=duck;
{
closest=dist;
ret=duck;