From e41bcc11780952cf615fae5ccda3e2a6ba4086a5 Mon Sep 17 00:00:00 2001
From: Guido Ranzuglia granzuglia <guido.ranzuglia@isti.cnr.it>
Date: Tue, 15 Oct 2013 07:50:23 +0000
Subject: [PATCH] fixed small bugs

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

diff --git a/src/meshlabplugins/decorate_base/decorate_base.cpp b/src/meshlabplugins/decorate_base/decorate_base.cpp
index 609392354..dc93ba0fe 100644
--- a/src/meshlabplugins/decorate_base/decorate_base.cpp
+++ b/src/meshlabplugins/decorate_base/decorate_base.cpp
@@ -836,12 +836,12 @@ int ExtraMeshDecoratePlugin::getDecorationClass(QAction *action) const
   case DP_SHOW_BOX_CORNERS :
   case DP_SHOW_QUOTED_BOX :
   case DP_SHOW_LABEL :
-  case DP_SHOW_CAMERA :
   case DP_SHOW_TEXPARAM :
   /*case DP_SHOW_SELECTED_FACE :
   case DP_SHOW_SELECTED_VERT :*/
   case DP_SHOW_BOUNDARY_TEX : return ExtraMeshDecoratePlugin::PerMesh;
   case DP_SHOW_AXIS : return ExtraMeshDecoratePlugin::PerDocument;
+  case DP_SHOW_CAMERA : return ExtraMeshDecoratePlugin::PerDocument;
   case DP_SHOW_SELECTED_MESH : return ExtraMeshDecoratePlugin::PerDocument;
   }
   assert (0);
diff --git a/src/meshlabplugins/decorate_base/decorate_base.h b/src/meshlabplugins/decorate_base/decorate_base.h
index 26a91a47a..22a44787f 100644
--- a/src/meshlabplugins/decorate_base/decorate_base.h
+++ b/src/meshlabplugins/decorate_base/decorate_base.h
@@ -80,7 +80,7 @@ public:
   {
     typeList <<
                 DP_SHOW_VERT <<
-                DP_SHOW_EDGE <<
+                //DP_SHOW_EDGE <<
                 DP_SHOW_NON_FAUX_EDGE <<
                 DP_SHOW_BOUNDARY <<
                 DP_SHOW_NON_MANIF_EDGE <<
diff --git a/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp b/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
index 49afac0cd..829af62f1 100644
--- a/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
+++ b/src/meshlabplugins/decorate_raster_proj/decorate_raster_proj.cpp
@@ -617,7 +617,7 @@ void DecorateRasterProjPlugin::decorateDoc( QAction           *act,
     {
         case DP_PROJECT_RASTER:
         {
-			if ((gla == NULL) || (gla->getCurrentRenderMode()))
+			if ((gla == NULL) || (gla->getCurrentRenderMode() == NULL))
 				return;
             glPushAttrib( GL_ALL_ATTRIB_BITS );