Merge commit '3ec33465b13ce35100e1557b499ffc335cd6e22c' into garux-merge

diff --cc libs/scenelib.h
Simple merge

diff --cc radiant/brush.h
index 21e7d9ca53e530ac0e6b29f06c1fa34a14d456af,93b3f6367449bdd47d6bbe00a4e569557224184d..56a2ec4a86d5764fca50d118f62c5d99ed41747a
--- 1/radiant/brush.h
--- 2/radiant/brush.h
+++ b/radiant/brush.h
@@@ -3314,9 -3195,13 +3314,14 @@@ void DEBUG_verify() const 
  bool isSelected() const {
        return m_selectable.isSelected();
  }
 +
  void setSelected( bool select ){
        m_selectable.setSelected( select );
+       if ( !select && parent() ){
+               Selectable* sel_parent = Instance_getSelectable( *parent() );
+               if ( sel_parent && sel_parent->isSelected() )
+                       sel_parent->setSelected( false );
+       }
  }
  
  void update_selected() const {

diff --cc radiant/patch.h
Simple merge

diff --cc radiant/renderer.h
Simple merge