From 3137badf0d013caefecd2694b67abfcb6041a8e3 Mon Sep 17 00:00:00 2001 From: Guido Ranzuglia granzuglia Date: Fri, 21 Feb 2014 17:21:08 +0000 Subject: [PATCH] - removed MM_FACECOLOR and MM_FACENORMAL from the list of the previewable filters, according to the MeshModelState semantic. --- src/meshlab/stdpardialog.cpp | 2 +- src/meshlab/xmlstdpardialog.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/meshlab/stdpardialog.cpp b/src/meshlab/stdpardialog.cpp index 93ecc77a0..ea7a7c8b9 100644 --- a/src/meshlab/stdpardialog.cpp +++ b/src/meshlab/stdpardialog.cpp @@ -94,7 +94,7 @@ void MeshlabStdDialog::changeCurrentMesh(int meshInd) bool MeshlabStdDialog::isPreviewable() { - return ((curmask != MeshModel::MM_UNKNOWN) && (curmask != MeshModel::MM_NONE) && !(curmask & MeshModel::MM_VERTNUMBER) && !(curmask & MeshModel::MM_FACENUMBER)); + return ((curmask != MeshModel::MM_UNKNOWN) && (curmask != MeshModel::MM_NONE) && !(curmask & MeshModel::MM_VERTNUMBER) && !(curmask & MeshModel::MM_FACENUMBER) && !(curmask & MeshModel::MM_FACENORMAL) && !(curmask & MeshModel::MM_FACECOLOR) ); } diff --git a/src/meshlab/xmlstdpardialog.cpp b/src/meshlab/xmlstdpardialog.cpp index baa9ae975..d8f089102 100644 --- a/src/meshlab/xmlstdpardialog.cpp +++ b/src/meshlab/xmlstdpardialog.cpp @@ -302,7 +302,7 @@ void MeshLabXMLStdDialog::changeCurrentMesh( int meshInd ) bool MeshLabXMLStdDialog::isPreviewable() const { - return ((curmask != MeshModel::MM_UNKNOWN) && (curmask != MeshModel::MM_NONE) && !(curmask & MeshModel::MM_VERTNUMBER) && !(curmask & MeshModel::MM_FACENUMBER)); + return ((curmask != MeshModel::MM_UNKNOWN) && (curmask != MeshModel::MM_NONE) && !(curmask & MeshModel::MM_VERTNUMBER) && !(curmask & MeshModel::MM_FACENUMBER) && !(curmask & MeshModel::MM_FACENORMAL) && !(curmask & MeshModel::MM_FACECOLOR)); } void MeshLabXMLStdDialog::resetExpressions()