From: TimePath <andrew.hardaker1995@gmail.com>
Date: Fri, 22 Jan 2016 06:54:45 +0000 (+1100)
Subject: Merge branch 'master' into Melanosuchus/cmake
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=940ca0c11718a95d34c9614e8533f066896c890f;p=xonotic%2Fnetradiant.git

Merge branch 'master' into Melanosuchus/cmake

# Conflicts:
#	radiant/mainframe.cpp
#	radiant/texwindow.cpp
---

940ca0c11718a95d34c9614e8533f066896c890f
diff --cc radiant/mainframe.cpp
index 6762360b,a91dccdd..bd512582
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@@ -2379,14 -2381,14 +2381,14 @@@ GtkToolbar* create_main_toolbar( MainFr
  
  	gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
  
- 	/*GtkButton* g_view_entities_button =*/ toolbar_append_button( toolbar, "Entities (N)", "entities.bmp", "ToggleEntityInspector" );
- 	GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.bmp", "ToggleConsole" );
- 	GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.bmp", "ToggleTextures" );
 -	GtkButton* g_view_entities_button = toolbar_append_button( toolbar, "Entities (N)", "entities.png", "ToggleEntityInspector" );
++	/*GtkButton* g_view_entities_button =*/ toolbar_append_button( toolbar, "Entities (N)", "entities.png", "ToggleEntityInspector" );
+ 	GtkButton* g_view_console_button = toolbar_append_button( toolbar, "Console (O)", "console.png", "ToggleConsole" );
+ 	GtkButton* g_view_textures_button = toolbar_append_button( toolbar, "Texture Browser (T)", "texture_browser.png", "ToggleTextures" );
  	// TODO: call light inspector
- 	//GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.bmp", "ToggleLightInspector");
+ 	//GtkButton* g_view_lightinspector_button = toolbar_append_button(toolbar, "Light Inspector", "lightinspector.png", "ToggleLightInspector");
  
  	gtk_toolbar_append_space( GTK_TOOLBAR( toolbar ) );
- 	/*GtkButton* g_refresh_models_button =*/ toolbar_append_button( toolbar, "Refresh Models", "refresh_models.bmp", "RefreshReferences" );
 -	GtkButton* g_refresh_models_button = toolbar_append_button( toolbar, "Refresh Models", "refresh_models.png", "RefreshReferences" );
++	/*GtkButton* g_refresh_models_button =*/ toolbar_append_button( toolbar, "Refresh Models", "refresh_models.png", "RefreshReferences" );
  
  
  	// disable the console and texture button in the regular layouts
diff --cc radiant/texwindow.cpp
index cf3fa3be,33e7e5c2..436377f1
--- a/radiant/texwindow.cpp
+++ b/radiant/texwindow.cpp
@@@ -1927,11 -1927,11 +1927,11 @@@ void TextureBrowser_checkTagFile()
  
  void TextureBrowser_SetNotex(){
  	StringOutputStream name( 256 );
- 	name << GlobalRadiant().getAppPath() << "bitmaps/notex.bmp";
+ 	name << GlobalRadiant().getAppPath() << "bitmaps/notex.png";
  	g_notex = name.c_str();
  
 -	name = NULL;
 +	name = StringOutputStream();
- 	name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.bmp";
+ 	name << GlobalRadiant().getAppPath() << "bitmaps/shadernotex.png";
  	g_shadernotex = name.c_str();
  }