Merge commit 'cac514541c3ae6f72c4c00c19c215ff62a023df4' into garux-merge

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

diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp
index dbf3666e22264b49b457993eaf3f371acf9c6052..70d25f7599b885b2f26d6b4f29019eee5fda3b8d 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;
 }
 };