Merge commit '2ab47003e0b34d7ca43d4ac5b9ae18d3413a4f4c' into garux-merge

[xonotic/netradiant.git] / radiant / select.cpp

diff --git a/radiant/select.cpp b/radiant/select.cpp
index bca6f2ccddb7f249e7538212b8bb050f812ef99c..f6546bd8cb44fc9411a25cd54bbde9fc0e931927 100644 (file)
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -405,7 +405,7 @@ bool pre( const scene::Path& path, scene::Instance& instance ) const {
        if ( m_depth == 2 ) { // entity depth
                // traverse and select children if any one is selected
                bool beselected = false;
-               if ( instance.childSelected() ) {
+               if ( instance.childSelected() || instance.isSelected() ) {
                        beselected = true;
                        if( path.top().get() != worldspawn ){
                                Instance_setSelected( instance, true );