X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fsurfacedialog.cpp;h=51d497ad78e5def5cbfaeebdc50889faf021436c;hb=644aa914b3ca91e5a778bf5c1cbf6c018758993d;hp=70d25f7599b885b2f26d6b4f29019eee5fda3b8d;hpb=b25e4389ba4d089fc94cc3860774c8510b843042;p=xonotic%2Fnetradiant.git

diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp
index 70d25f75..51d497ad 100644
--- a/radiant/surfacedialog.cpp
+++ b/radiant/surfacedialog.cpp
@@ -1355,21 +1355,20 @@ void TextureClipboard_textureSelected( const char* shader ){
 }
 
 class TextureBrowser;
-extern TextureBrowser g_TextureBrowser;
 void TextureBrowser_SetSelectedShader( TextureBrowser& textureBrowser, const char* shader );
 const char* TextureBrowser_GetSelectedShader( TextureBrowser& textureBrowser );
 
 void Scene_copyClosestTexture( SelectionTest& test ){
 	CopiedString shader;
 	if ( Scene_getClosestTexture( GlobalSceneGraph(), test, shader, g_faceTextureClipboard.m_projection, g_faceTextureClipboard.m_flags ) ) {
-		TextureBrowser_SetSelectedShader( g_TextureBrowser, shader.c_str() );
+		TextureBrowser_SetSelectedShader( GlobalTextureBrowser(), shader.c_str() );
 	}
 }
 
 void Scene_applyClosestTexture( SelectionTest& test ){
 	UndoableCommand command( "facePaintTexture" );
 
-	Scene_setClosestTexture( GlobalSceneGraph(), test, TextureBrowser_GetSelectedShader( g_TextureBrowser ), g_faceTextureClipboard.m_projection, g_faceTextureClipboard.m_flags );
+	Scene_setClosestTexture( GlobalSceneGraph(), test, TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ), g_faceTextureClipboard.m_projection, g_faceTextureClipboard.m_flags );
 
 	SceneChangeNotify();
 }
@@ -1384,13 +1383,13 @@ void SelectedFaces_copyTexture(){
 		face.GetTexdef( g_faceTextureClipboard.m_projection );
 		g_faceTextureClipboard.m_flags = face.getShader().m_flags;
 
-		TextureBrowser_SetSelectedShader( g_TextureBrowser, face.getShader().getShader() );
+		TextureBrowser_SetSelectedShader( GlobalTextureBrowser(), face.getShader().getShader() );
 	}
 }
 
 void FaceInstance_pasteTexture( FaceInstance& faceInstance ){
 	faceInstance.getFace().SetTexdef( g_faceTextureClipboard.m_projection );
-	faceInstance.getFace().SetShader( TextureBrowser_GetSelectedShader( g_TextureBrowser ) );
+	faceInstance.getFace().SetShader( TextureBrowser_GetSelectedShader( GlobalTextureBrowser() ) );
 	faceInstance.getFace().SetFlags( g_faceTextureClipboard.m_flags );
 	SceneChangeNotify();
 }