lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-19 02:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fixed crash with texture files

Browse Source
This commit is contained in:
Guido Ranzuglia granzuglia 2016-05-23 09:01:50 +00:00
parent 18dfd69541
commit 43d3ea8adb
2 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/meshlab/glarea.cpp
View File

@ -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);
}
}
//}
}
}

38
src/meshlab/ml_render_gui.h
View File

@ -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