Merge commit 'b681f28130ff2e9789253eff1c1d41163e427eaa' into master-merge

diff --cc radiant/environment.cpp
Simple merge

diff --cc radiant/mainframe.cpp
index 1bea47d16daa80c47f0b4ca559b64d8e9871ba7b,6f377579f484b3015ce5876c606a19e35b1e3023..84ab042c1bcf94e39487b28e1ba4f2ba2ba3db08
--- 1/radiant/mainframe.cpp
--- 2/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -3680,15 -3532,12 +3685,14 @@@ void MainFrame_Construct()
  #error "unknown platform"
  #endif
                ;
 +
                StringOutputStream path( 256 );
                path << DirectoryCleaned( g_pGameDescription->getRequiredKeyValue( ENGINEPATH_ATTRIBUTE ) );
 -              g_strEnginePath = path.c_str();
 +
 +              g_strEnginePath = transformPath( path.c_str() ).c_str();
+               GlobalPreferenceSystem().registerPreference( "EnginePath", make_property_string( g_strEnginePath ) );
        }
  
-       GlobalPreferenceSystem().registerPreference( "EnginePath", make_property_string( g_strEnginePath ) );
- 
        GlobalPreferenceSystem().registerPreference( "DisableEnginePath", make_property_string( g_disableEnginePath ) );
        GlobalPreferenceSystem().registerPreference( "DisableHomePath", make_property_string( g_disableHomePath ) );
  

diff --cc radiant/map.cpp
Simple merge

diff --cc radiant/texwindow.cpp
Simple merge

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

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

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

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

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

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