From e979a6e52bfdb599e41c488584f9b4b7caa34ee4 Mon Sep 17 00:00:00 2001
From: Guido Ranzuglia granzuglia <guido.ranzuglia@isti.cnr.it>
Date: Mon, 9 Jul 2012 14:56:36 +0000
Subject: [PATCH] - removed conflict between glew and QtOpenGL causing #warning
 problem - commented cubemap (but the code is still there...) decoration

---
 src/meshlabplugins/decorate_background/cubemap.cpp             | 2 +-
 src/meshlabplugins/decorate_background/decorate_background.cpp | 2 +-
 src/meshlabplugins/decorate_background/decorate_background.h   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/meshlabplugins/decorate_background/cubemap.cpp b/src/meshlabplugins/decorate_background/cubemap.cpp
index c35c636ca..5f2c85a3b 100755
--- a/src/meshlabplugins/decorate_background/cubemap.cpp
+++ b/src/meshlabplugins/decorate_background/cubemap.cpp
@@ -30,7 +30,7 @@
 #include<string>
 
 #include<QImage>
-#include<QtOpenGL>
+#include<QGLWidget>
 #include <wrap/qt/checkGLError.h>
 
 using namespace vcg;
diff --git a/src/meshlabplugins/decorate_background/decorate_background.cpp b/src/meshlabplugins/decorate_background/decorate_background.cpp
index 96b882e61..67e335149 100644
--- a/src/meshlabplugins/decorate_background/decorate_background.cpp
+++ b/src/meshlabplugins/decorate_background/decorate_background.cpp
@@ -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 :
diff --git a/src/meshlabplugins/decorate_background/decorate_background.h b/src/meshlabplugins/decorate_background/decorate_background.h
index cd8346bad..786c503a0 100644
--- a/src/meshlabplugins/decorate_background/decorate_background.h
+++ b/src/meshlabplugins/decorate_background/decorate_background.h
@@ -68,7 +68,7 @@ public:
 	SampleMeshDecoratePlugin()
 	{
     typeList
-    << DP_SHOW_CUBEMAPPED_ENV
+    /*<< DP_SHOW_CUBEMAPPED_ENV*/
     << DP_SHOW_GRID;
 
     FilterIDType tt;