Merge commit '0261afc6df181092b7d57751fec84e21d3ac593c' into garux-merge

diff --cc plugins/mapq3/write.cpp
index 4bfbbe78da0097a8d8974a4c658ac32b7eb0767f,f7becfeebdaf99c5a56eff86fdf37ff73072d7d7..cbf0ec05140334b31be28215bee76a8c1cbb84ce
--- 1/plugins/mapq3/write.cpp
--- 2/plugins/mapq3/write.cpp
+++ b/plugins/mapq3/write.cpp
@@@ -72,12 -70,14 +72,16 @@@ bool pre( scene::Node &node ) const 
  
        Entity* entity = Node_getEntity( node );
        if ( entity != 0 ) {
 -              m_writer.writeToken( "//" );
 -              m_writer.writeToken( "entity" );
 -              m_writer.writeUnsigned( g_count_entities++ );
 -              m_writer.nextLine();
+               if( entity->isContainer() && Node_getTraversable( node )->empty() && !string_equal( entity->getKeyValue( "classname" ), "worldspawn" ) ){
+                       globalErrorStream() << "discarding empty group entity: # = " << g_count_entities << "; classname = " << entity->getKeyValue( "classname" ) << "\n";
+                       return false;
+               }
 +              if ( m_writeComments ) {
 +                      m_writer.writeToken( "//" );
 +                      m_writer.writeToken( "entity" );
 +                      m_writer.writeUnsigned( g_count_entities++ );
 +                      m_writer.nextLine();
 +              }
  
                m_writer.writeToken( "{" );
                m_writer.nextLine();

diff --cc radiant/brush.h
Simple merge

diff --cc radiant/entityinspector.cpp
index 81bcd06c8031cd65741b8ad2b3b18da84e8e9572,45232943f18d2002bd873768e3af46394ca3947d..a2291f8fd59fdeb04a449887a1336a0460686dc5
--- 1/radiant/entityinspector.cpp
--- 2/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@@ -1216,8 -1233,8 +1216,8 @@@ static gint EntityClassList_keypress( u
        }
  
        // select the entity that starts with the key pressed
-       if ( code <= 'Z' && code >= 'A' ) {
+       if ( code <= 'Z' && code >= 'A' && event->state == 0 ) {
 -              GtkTreeView* view = g_entityClassList;
 +              auto view = ui::TreeView(g_entityClassList);
                GtkTreeModel* model;
                GtkTreeIter iter;
                if ( gtk_tree_selection_get_selected( gtk_tree_view_get_selection( view ), &model, &iter ) == FALSE

diff --cc radiant/mainframe.cpp
index 61c364e0394dbf501ceb5b83f1645663d48ad01b,75662b23bfc08052610d2731fb2c8db55e49d2e9..133b4a75bfd5666ef2ab8203738185acd5a36412
--- 1/radiant/mainframe.cpp
--- 2/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -2620,36 -2454,40 +2620,40 @@@ ui::Toolbar create_main_toolbar( MainFr
        return toolbar;
  }
  
 -GtkWidget* create_main_statusbar( GtkWidget *pStatusLabel[c_count_status] ){
 -      GtkTable* table = GTK_TABLE( gtk_table_new( 1, c_count_status, FALSE ) );
 -      gtk_widget_show( GTK_WIDGET( table ) );
 +ui::Widget create_main_statusbar( ui::Widget pStatusLabel[c_count_status] ){
 +      auto table = ui::Table( 1, c_count_status, FALSE );
 +      table.show();
  
        {
 -              GtkLabel* label = GTK_LABEL( gtk_label_new( "Label" ) );
 +              auto label = ui::Label( "Label" );
                gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
                gtk_misc_set_padding( GTK_MISC( label ), 4, 2 );
 -              gtk_widget_show( GTK_WIDGET( label ) );
 -              gtk_table_attach_defaults( table, GTK_WIDGET( label ), 0, 1, 0, 1 );
 -              pStatusLabel[c_command_status] = GTK_WIDGET( label );
 +              label.show();
 +              table.attach(label, {0, 1, 0, 1});
 +              pStatusLabel[c_command_status] = ui::Widget(label );
        }
  
 -      for ( int i = 1; i < c_count_status; ++i )
 +      for (unsigned int i = 1; (int) i < c_count_status; ++i)
        {
 -              GtkFrame* frame = GTK_FRAME( gtk_frame_new( 0 ) );
 -              gtk_widget_show( GTK_WIDGET( frame ) );
 -              gtk_table_attach_defaults( table, GTK_WIDGET( frame ), i, i + 1, 0, 1 );
 +              auto frame = ui::Frame();
 +              frame.show();
 +              table.attach(frame, {i, i + 1, 0, 1});
                gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
  
 -              GtkLabel* label = GTK_LABEL( gtk_label_new( "Label" ) );
 +              auto label = ui::Label( "Label" );
-               gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_END );
+               if( i == c_texture_status )
+                       gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_START );
+               else
+                       gtk_label_set_ellipsize( label, PANGO_ELLIPSIZE_END );
+ 
                gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
                gtk_misc_set_padding( GTK_MISC( label ), 4, 2 );
 -              gtk_widget_show( GTK_WIDGET( label ) );
 -              gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( label ) );
 -              pStatusLabel[i] = GTK_WIDGET( label );
 +              label.show();
 +              frame.add(label);
 +              pStatusLabel[i] = ui::Widget(label );
        }
  
 -      return GTK_WIDGET( table );
 +      return ui::Widget(table );
  }
  
  #if 0

diff --cc radiant/map.cpp
index fa19512d7f29680c2ec02ed4de455e203af7e14c,73fceb5d449f01bec55f10222f3429887c0ccb2a..e52a3d188075da20a3d93b16a4251162721447f9
--- 1/radiant/map.cpp
--- 2/radiant/map.cpp
+++ b/radiant/map.cpp
@@@ -2204,10 -2107,9 +2204,10 @@@ public
  BrushFindIndexWalker( const scene::Node& node, std::size_t& count )
        : m_node( &node ), m_count( count ){
  }
- bool pre( const scene::Path& path, scene::Instance& instance ) const {
-       if ( Node_isPrimitive( path.top() ) ) {
-               if ( m_node == path.top().get_pointer() ) {
 +
+ bool pre( scene::Node& node ) const {
+       if ( Node_isPrimitive( node ) ) {
+               if ( m_node == &node ) {
                        m_node = 0;
                }
                if ( m_node ) {
@@@ -2226,10 -2128,9 +2226,10 @@@ public
  EntityFindIndexWalker( const scene::Node& node, std::size_t& count )
        : m_node( &node ), m_count( count ){
  }
- bool pre( const scene::Path& path, scene::Instance& instance ) const {
-       if ( Node_isEntity( path.top() ) ) {
-               if ( m_node == path.top().get_pointer() ) {
 +
+ bool pre( scene::Node& node ) const {
+       if ( Node_isEntity( node ) ) {
+               if ( m_node == &node ) {
                        m_node = 0;
                }
                if ( m_node ) {

diff --cc radiant/patch.h
Simple merge

diff --cc radiant/select.cpp
Simple merge

diff --cc radiant/selection.cpp
Simple merge

diff --cc tools/quake3/q3map2/light.c
Simple merge

diff --cc tools/quake3/q3map2/light_ydnar.c
Simple merge

diff --cc tools/quake3/q3map2/q3map2.h
Simple merge

diff --cc tools/quake3/q3map2/shaders.c
Simple merge