Fix 1891410: Have neither Control-A nor dragging a box around ducks select non-editab...

git-svn-id: http://svn.voria.com/code@1677 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/AUTHORS b/synfig-studio/trunk/AUTHORS
index b3169e9..cea7270 100644 (file)
--- a/synfig-studio/trunk/AUTHORS
+++ b/synfig-studio/trunk/AUTHORS
@@ -17,6 +17,7 @@ Andreas Jochens
 Chris Norman (PXEGeek)
 Timo Paulssen (timonator)
 IL'dar AKHmetgaleev (AkhIL)
+Gerald Young (Yoyobuae)
 
 Translators:
 

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
index cd137cb..2db91b8 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp
@@ -259,7 +259,7 @@ Duckmatic::is_duck_group_selectable(const etl::handle<Duck>& x)const
 {
        const Type type(get_type_mask());
 
-       if(( x->get_type() && (!(type & x->get_type())) ) )
+       if(( x->get_type() && (!(type & x->get_type())) || !x->get_editable() ) )
                return false;
 
        if(x->get_value_desc().parent_is_layer_param() && type & Duck::TYPE_POSITION)
@@ -768,8 +768,6 @@ Duckmatic::find_duck(synfig::Point point, synfig::Real radius, Duck::Type type)
        {
                const Duck::Handle& duck(iter->second);
 
-               if(!duck->get_editable())
-                       continue;
                Real dist((duck->get_trans_point()-point).mag_squared());
 
                if(duck->get_type()&Duck::TYPE_VERTEX)