Merge commit 'f472e6f0e8066e62cf3e159287bb07de97d2e59d' into master-merge

diff --cc contrib/bobtoolz/bobToolz-GTK.cpp
Simple merge

diff --cc libs/gtkutil/xorrectangle.cpp
Simple merge

diff --cc radiant/camwindow.cpp
Simple merge

diff --cc radiant/mainframe.cpp
Simple merge

diff --cc radiant/map.cpp
Simple merge

diff --cc radiant/plugintoolbar.cpp
index 25ff2cd49fc8fbd7ee714e8931bcc99e11cf9aa7,e3c8cb95cd5ba72a00c9c5d8396ad6ebad07ef57..d0745f4af9c3c381af27cca7c29273b8c47e4d07
--- 1/radiant/plugintoolbar.cpp
--- 2/radiant/plugintoolbar.cpp
+++ b/radiant/plugintoolbar.cpp
@@@ -34,9 -34,9 +34,10 @@@
  #include "plugin.h"
  
  ui::Image new_plugin_image( const char* filename ){
++      // NetRadiantCustom look for AppPath (DataPath) plugins dir before GameToolsPath plugins dir.
        {
                StringOutputStream fullpath( 256 );
 -              fullpath << AppPath_get() << g_pluginsDir << "bitmaps/" << filename;
 +              fullpath << GameToolsPath_get() << g_pluginsDir << "bitmaps/" << filename;
                if ( auto image = image_new_from_file_with_mask(fullpath.c_str()) ) return image;
        }
  

diff --cc radiant/qe3.cpp
index ab62a9190bc28f35d1307ad04e8dcf2686ea4531,62530c11447964b2454309b5ebff27fb941969fb..09d49d30dfabecc711eba8afc172e62ddc987cfb
--- 1/radiant/qe3.cpp
--- 2/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@@ -223,11 -202,18 +223,19 @@@ void bsp_init()
        build_set_variable( "ExtraQ3map2Args", ExtraQ3map2Args.c_str() );
  
        const char* mapname = Map_Name( g_map );
 -      StringOutputStream name( 256 );
 -      name << StringRange( mapname, path_get_filename_base_end( mapname ) ) << ".bsp";
 +      std::string name;
 +      name.append( mapname, path_get_filename_base_end( mapname ) - mapname );
 +      name += ".bsp";
  
-       build_set_variable( "MapFile", mapname );
+       if( region_active ){
+               StringOutputStream name( 256 );
+               name << StringRange( mapname, path_get_filename_base_end( mapname ) ) << ".reg";
+               build_set_variable( "MapFile", name.c_str() );
+       }
+       else{
+               build_set_variable( "MapFile", mapname );
+       }
+ 
        build_set_variable( "BspFile", name.c_str() );
  }
  

diff --cc radiant/renderstate.cpp
Simple merge

diff --cc radiant/xywindow.cpp
Simple merge

diff --cc radiant/xywindow.h
index 6ace2803b4a543156a0859ba84714d28d5c09078,dcc5c0ecf86e6fcad297daa882eb3f5b9e01eb2d..071f132cbe5dd19713a90ba207672cd3cfc0aa59
--- 1/radiant/xywindow.h
--- 2/radiant/xywindow.h
+++ b/radiant/xywindow.h
@@@ -128,10 -128,10 +128,13 @@@ void ZoomIn()
  void ZoomOut();
  void ZoomInWithMouse( int pointx, int pointy );
  
 +void Redraw();
 +
+ void RenderActive();
++
  void SetActive( bool b ){
        m_bActive = b;
+       RenderActive();
  };
  bool Active(){
        return m_bActive;