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

- removed conflict between glew and QtOpenGL causing #warning problem

Browse Source 
- commented cubemap (but the code is still there...) decoration
This commit is contained in:
Guido Ranzuglia granzuglia 2012-07-09 14:56:36 +00:00
parent 3c5a96a032
commit e979a6e52b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/meshlabplugins/decorate_background/cubemap.cpp
View File

@ -30,7 +30,7 @@
#include<string>
#include<QImage>
#include<QtOpenGL>
#include<QGLWidget>
#include <wrap/qt/checkGLError.h>
using namespace vcg;

2
src/meshlabplugins/decorate_background/decorate_background.cpp
View File

@ -65,7 +65,7 @@ void SampleMeshDecoratePlugin::initGlobalParameterSet(QAction *action, RichParam
if(!parset.hasParameter(CubeMapPathParam()))
{
QString cubemapDirPath = PluginManager::getBaseDirPath() + QString("/textures/cubemaps/uffizi.jpg");
parset.addParam(new RichString(CubeMapPathParam(), cubemapDirPath,"",""));
//parset.addParam(new RichString(CubeMapPathParam(), cubemapDirPath,"",""));
}
break;
case DP_SHOW_GRID :

2
src/meshlabplugins/decorate_background/decorate_background.h
View File

@ -68,7 +68,7 @@ public:
SampleMeshDecoratePlugin()
{
typeList
<< DP_SHOW_CUBEMAPPED_ENV
/*<< DP_SHOW_CUBEMAPPED_ENV*/
<< DP_SHOW_GRID;
FilterIDType tt;