Merge commit '6352fbdd7968d7dffa2ba4c57ee5cade250e04ed' into master-merge

[xonotic/netradiant.git] / radiant / surfacedialog.cpp

diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp
index dbf3666e22264b49b457993eaf3f371acf9c6052..51d497ad78e5def5cbfaeebdc50889faf021436c 100644 (file)
--- a/radiant/surfacedialog.cpp
+++ b/radiant/surfacedialog.cpp
@@ -412,7 +412,7 @@ void DoSurface( void ){
 
        }
        getSurfaceInspector().Update();
-       getSurfaceInspector().importData();
+       //getSurfaceInspector().importData(); //happens in .ShowDlg() anyway
        getSurfaceInspector().ShowDlg();
 }
 
@@ -433,12 +433,12 @@ void SurfaceInspector_FitTexture(){
 
 void SurfaceInspector_FitTextureW(){
        UndoableCommand undo( "textureAutoFitW" );
-       Select_FitTextureW( getSurfaceInspector().m_fitHorizontal, getSurfaceInspector().m_fitVertical );
+       Select_FitTexture( getSurfaceInspector().m_fitHorizontal, 0 );
 }
 
 void SurfaceInspector_FitTextureH(){
        UndoableCommand undo( "textureAutoFitH" );
-       Select_FitTextureH( getSurfaceInspector().m_fitHorizontal, getSurfaceInspector().m_fitVertical );
+       Select_FitTexture( 0, getSurfaceInspector().m_fitVertical );
 }
 
 static void OnBtnPatchdetails( ui::Widget widget, gpointer data ){
@@ -1306,6 +1306,9 @@ bool pre( const scene::Path& path, scene::Instance& instance ) const {
                        }
                }
        }
+       else{
+               return false;
+       }
        return true;
 }
 };
@@ -1352,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();
 }
@@ -1381,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();
 }