From 43d3ea8adb8a5f3d055a9fac6cb7ce29bd2e7ec0 Mon Sep 17 00:00:00 2001
From: Guido Ranzuglia granzuglia <guido.ranzuglia@isti.cnr.it>
Date: Mon, 23 May 2016 09:01:50 +0000
Subject: [PATCH] - fixed crash with texture files

---
 src/meshlab/glarea.cpp      | 16 +++++-----------
 src/meshlab/ml_render_gui.h | 38 -------------------------------------
 2 files changed, 5 insertions(+), 49 deletions(-)

diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp
index c438777cf..19501387a 100644
--- a/src/meshlab/glarea.cpp
+++ b/src/meshlab/glarea.cpp
@@ -422,11 +422,11 @@ void GLArea::paintEvent(QPaintEvent* /*event*/)
     QTime time;
     time.start();
 
-    //if(!this->md()->isBusy())
-    //{
-    //    initTexture(hasToUpdateTexture);
-    //    hasToUpdateTexture=false;
-    //}
+    /*if(!this->md()->isBusy())
+    {
+        initTexture(hasToUpdateTexture);
+        hasToUpdateTexture=false;
+    }*/
 
     glClearColor(1.0,1.0,1.0,0.0);
     glEnable(GL_DEPTH_TEST);
@@ -495,11 +495,6 @@ void GLArea::paintEvent(QPaintEvent* /*event*/)
             {
                 if (meshVisibilityMap[mp->id()])
                 {
-//WARNING!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! That's really important
-/*RenderMode rm = it.value();
-setLightModel(rm);*/
-/////////////////////////////////////////////////////////////////////////////////////
-
                     MLRenderingData curr;
                     datacont->getRenderInfoPerMeshView(mp->id(),context(),curr);
                     setLightModel(curr);
@@ -527,7 +522,6 @@ setLightModel(rm);*/
                         decorInterface->decorateMesh(*it,*mp,this->glas.currentGlobalParamSet, this,&painter,md()->Log);
                     }
                 }
-                //}
             }
 
         }
diff --git a/src/meshlab/ml_render_gui.h b/src/meshlab/ml_render_gui.h
index cc5ef0f7f..8952e7eb1 100644
--- a/src/meshlab/ml_render_gui.h
+++ b/src/meshlab/ml_render_gui.h
@@ -178,44 +178,6 @@ private:
     MLRenderingToolbar* _colortool;
 };
 
-//
-//
-//class MLRenderingSolidParametersFrame : public MLRenderingParametersFrame
-//{
-//    Q_OBJECT
-//public:
-//    MLRenderingSolidParametersFrame(QWidget* parent);
-//    MLRenderingSolidParametersFrame(int meshid,QWidget* parent);    
-//    ~MLRenderingSolidParametersFrame();
-//    void setPrimitiveButtonStatesAccordingToRenderingData(const MLRenderingData& dt);
-//    void setAssociatedMeshId(int meshid);
-//
-//private:
-//    void initGui();
-//    MLRenderingToolbar* _shadingtool;
-//    MLRenderingToolbar* _colortool;
-//    MLRenderingToolbar* _texttool;
-//};
-//
-//
-//class MLRenderingSolidParametersFrame : public MLRenderingParametersFrame
-//{
-//    Q_OBJECT
-//public:
-//    MLRenderingSolidParametersFrame(QWidget* parent);
-//    MLRenderingSolidParametersFrame(int meshid,QWidget* parent);    
-//    ~MLRenderingSolidParametersFrame();
-//    void setPrimitiveButtonStatesAccordingToRenderingData(const MLRenderingData& dt);
-//    void setAssociatedMeshId(int meshid);
-//
-//private:
-//    void initGui();
-//    MLRenderingToolbar* _shadingtool;
-//    MLRenderingToolbar* _colortool;
-//    MLRenderingToolbar* _texttool;
-//};
-
-
 class MLRenderingParametersTab : public QTabWidget
 {
     Q_OBJECT