Merge commit '173f350be76237a7dee9c00c389dff4e56b3da4c' into garux-merge

diff --cc Makefile
Simple merge

diff --cc libs/os/file.h
index 144627e65a9dcea34a7ad9adf8a03aef9a613d9d,41c20c1550798bb95628087075350231f0d21ac9..252085c2b8013628ecbcbd541ed47373410827d6
--- 1/libs/os/file.h
--- 2/libs/os/file.h
+++ b/libs/os/file.h
@@@ -27,9 -25,22 +27,22 @@@
  /// \file
  /// \brief OS file-system querying and manipulation.
  
 -#if defined( WIN32 )
 +#if GDEF_OS_WINDOWS
  #define S_ISDIR( mode ) ( mode & _S_IFDIR )
  #include <io.h> // _access()
+ 
+ #ifndef F_OK
+ #define F_OK 0x00
+ #endif
+ 
+ #ifndef W_OK
+ #define W_OK 0x02
+ #endif
+ 
+ #ifndef R_OK
+ #define R_OK 0x04
+ #endif
+ 
  #define access( path, mode ) _access( path, mode )
  #else
  #include <unistd.h> // access()

diff --cc libs/picomodel/picointernal.c
Simple merge

diff --cc libs/render.h
Simple merge

diff --cc plugins/entity/doom3group.cpp
Simple merge

diff --cc plugins/entity/group.cpp
index bad7fc54e793b102a8bcd2caae1f6bd896497b9d,65d8cca6b25a1eef23bb0ef2e7b6258727a5c9fb..b2c01e9f1f3496d96509c81c4c87968e3023cf12
--- 1/plugins/entity/group.cpp
--- 2/plugins/entity/group.cpp
+++ b/plugins/entity/group.cpp
@@@ -63,11 -63,11 +63,11 @@@ NameKeys m_nameKeys
  OriginKey m_originKey;
  Vector3 m_origin;
  
- RenderableNamedEntity m_renderName;
  mutable Vector3 m_name_origin;
+ RenderableNamedEntity m_renderName;
  
 -Callback m_transformChanged;
 -Callback m_evaluateTransform;
 +Callback<void()> m_transformChanged;
 +Callback<void()> m_evaluateTransform;
  
  void construct(){
        m_keyObservers.insert( "classname", ClassnameFilter::ClassnameChangedCaller( m_filter ) );

diff --cc plugins/entity/light.cpp
index 65ac614e25ad1aa3b6bb8dfd457f084cda3b0331,f0261cc5f1e7ab210ba9f18ccc487ff4685b5549..890d2e8cd33e49e58a0d660bf0f47063750da519
--- 1/plugins/entity/light.cpp
--- 2/plugins/entity/light.cpp
+++ b/plugins/entity/light.cpp
@@@ -805,11 -807,9 +807,9 @@@ RenderLightProjection m_renderProjectio
  
  LightShader m_shader;
  
- AABB m_aabb_light;
- 
 -Callback m_transformChanged;
 -Callback m_boundsChanged;
 -Callback m_evaluateTransform;
 +Callback<void()> m_transformChanged;
 +Callback<void()> m_boundsChanged;
 +Callback<void()> m_evaluateTransform;
  
  void construct(){
        default_rotation( m_rotation );

diff --cc radiant/console.cpp
index 82b08e3c2ab5468ca1919e0a094dd0a99af7a9e7,94060a456dab4561946279199216960b04886a46..ea837329831319bb94c23af6f0840d847e3e85ba
--- 1/radiant/console.cpp
--- 2/radiant/console.cpp
+++ b/radiant/console.cpp
@@@ -141,8 -147,8 +144,8 @@@ GtkTextTag* tag
  public:
  GtkTextBufferOutputStream( GtkTextBuffer* textBuffer, GtkTextIter* iter, GtkTextTag* tag ) : textBuffer( textBuffer ), iter( iter ), tag( tag ){
  }
- std::size_t write( const char* buffer, std::size_t length ){
+ std::size_t __attribute__((optimize("O0"))) write( const char* buffer, std::size_t length ){
 -      gtk_text_buffer_insert_with_tags( textBuffer, iter, buffer, gint( length ), tag, 0 );
 +      gtk_text_buffer_insert_with_tags( textBuffer, iter, buffer, gint( length ), tag, NULL );
        return length;
  }
  };

diff --cc radiant/mainframe.cpp
Simple merge

diff --cc radiant/preferences.cpp
Simple merge

diff --cc radiant/texwindow.cpp
index 772f80b199dd47919e899c9d9006ab2e6b54e340,3ea764bbeab11c0d942fd327fa6fcd817464ed40..416d31789184d02b77e4c610fdbd282296918f86
--- 1/radiant/texwindow.cpp
--- 2/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@@ -1679,20 -1575,23 +1679,21 @@@ TextureGroups TextureGroups_constructTr
  
  void TextureBrowser_constructTreeStore(){
        TextureGroups groups = TextureGroups_constructTreeView();
 -      GtkTreeStore* store = gtk_tree_store_new( 1, G_TYPE_STRING );
 +      auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING ));
        TextureGroups_constructTreeModel( groups, store );
 -      //std::set<CopiedString>::iterator iter;
 -
 -      GtkTreeModel* model = GTK_TREE_MODEL( store );
++      std::set<CopiedString>::iterator iter;
  
 -      gtk_tree_view_set_model( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTree ), model );
 +      gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTree, store);
  
        g_object_unref( G_OBJECT( store ) );
  }
  
  void TextureBrowser_constructTreeStoreTags(){
-       TextureGroups groups;
+       //TextureGroups groups;
 -      GtkTreeStore* store = gtk_tree_store_new( 1, G_TYPE_STRING );
 -      GtkTreeModel* model = GTK_TREE_MODEL( g_TextureBrowser.m_all_tags_list );
 +      auto store = ui::TreeStore::from(gtk_tree_store_new( 1, G_TYPE_STRING ));
 +    auto model = g_TextureBrowser.m_all_tags_list;
  
 -      gtk_tree_view_set_model( GTK_TREE_VIEW( g_TextureBrowser.m_treeViewTags ), model );
 +      gtk_tree_view_set_model(g_TextureBrowser.m_treeViewTags, model );
  
        g_object_unref( G_OBJECT( store ) );
  }

diff --cc radiant/watchbsp.cpp
Simple merge

diff --cc tools/quake2/common/inout.c
Simple merge

diff --cc tools/quake2/q2map/qbsp.c
Simple merge

diff --cc tools/quake2/qdata/images.c
index 00f30e05701dd2389ed641576cb42f04d1e19c23,ce3ff136bba4d48faedf1f242dc89a89d5763153..6a50cdb717537d116ad41b0b31ccdcdc67b2c40e
--- 1/tools/quake2/qdata/images.c
--- 2/tools/quake2/qdata/images.c
+++ b/tools/quake2/qdata/images.c
@@@ -1,5 -1,5 +1,5 @@@
- /*
+ /*
 -   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
 +   Copyright (C) 1999-2007 id Software, Inc. and contributors.
     For a list of contributors, see the accompanying CONTRIBUTORS file.
  
     This file is part of GtkRadiant.

diff --cc tools/quake2/qdata/video.c
Simple merge

diff --cc tools/quake2/qdata_heretic2/common/cmdlib.c
Simple merge

diff --cc tools/quake2/qdata_heretic2/common/inout.c
Simple merge

diff --cc tools/quake3/common/inout.c
index 5ade8802ca7eac347f2ebe14f81c85b36c89802c,827bdceb3b84e8d982f83aa82c604b277e21291b..1a7c6b8a0be3ff655c8437074dba4fde9d7280c9
--- 1/tools/quake3/common/inout.c
--- 2/tools/quake3/common/inout.c
+++ b/tools/quake3/common/inout.c
@@@ -150,10 -148,10 +150,10 @@@ void xml_Select( char *msg, int entityn
        // now build a proper "select" XML node
        sprintf( buf, "Entity %i, Brush %i: %s", entitynum, brushnum, msg );
        node = xmlNewNode( NULL, (xmlChar*)"select" );
-       xmlNodeSetContent( node, (xmlChar*)buf );
+       xmlNodeAddContent( node, (xmlChar*)buf );
        level[0] = (int)'0' + ( bError ? SYS_ERR : SYS_WRN )  ;
        level[1] = 0;
 -      xmlSetProp( node, (xmlChar*)"level", (xmlChar *)&level );
 +      xmlSetProp( node, (xmlChar*)"level", (xmlChar*)&level );
        // a 'select' information
        sprintf( buf, "%i %i", entitynum, brushnum );
        select = xmlNewNode( NULL, (xmlChar*)"brush" );

diff --cc tools/quake3/common/vfs.h
Simple merge

diff --cc tools/quake3/q3map2/bsp.c
index 96da9ba864c9f7650f23841b5bcf93ad87d31513,b9344a3aac29a5328feca4bb4c72a03d3cfb1efb..dff448507055cfcf8c0cd1d40f87337e7f4383da
--- 1/tools/quake3/q3map2/bsp.c
--- 2/tools/quake3/q3map2/bsp.c
+++ b/tools/quake3/q3map2/bsp.c
@@@ -347,9 -347,9 +347,9 @@@ void ProcessWorldModel( const char *por
                Sys_FPrintf( SYS_NOXML, "**********************\n" );
                Sys_FPrintf( SYS_NOXML, "******* leaked *******\n" );
                Sys_FPrintf( SYS_NOXML, "**********************\n" );
 -              polyline = LeakFile( tree );
 +              polyline = LeakFile( tree, lineFilePath );
                leaknode = xmlNewNode( NULL, (xmlChar*)"message" );
-               xmlNodeSetContent( leaknode, (xmlChar*)"MAP LEAKED\n" );
+               xmlNodeAddContent( leaknode, (xmlChar*)"MAP LEAKED\n" );
                xmlAddChild( leaknode, polyline );
                level[0] = (int) '0' + SYS_ERR;
                level[1] = 0;

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

diff --cc tools/quake3/q3map2/light_ydnar.c
index 5f46268f5b7c57fc0ee1e51677b998c93e440103,83595337a81d7be42a1a86c5b68a5e8afc86679a..bc10b2f65f50131c55c6985a6f2781775a123289
--- 1/tools/quake3/q3map2/light_ydnar.c
--- 2/tools/quake3/q3map2/light_ydnar.c
+++ b/tools/quake3/q3map2/light_ydnar.c
@@@ -3159,10 -3219,9 +3159,9 @@@ void IlluminateVertexes( int num )
     determines opaque brushes in the world and find sky shaders for sunlight calculations
   */
  
 -void SetupBrushesFlags( int mask_any, int test_any, int mask_all, int test_all ){
 +void SetupBrushesFlags( unsigned int mask_any, unsigned int test_any, unsigned int mask_all, unsigned int test_all ){
        int i, j, b;
        unsigned int compileFlags, allCompileFlags;
-       qboolean inside;
        bspBrush_t      *brush;
        bspBrushSide_t  *side;
        bspShader_t     *shader;

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

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

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