From 080fd7b17c67157a9526f412491d9aa3dd7b3985 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni Date: Tue, 10 Apr 2018 23:27:06 +0200 Subject: [PATCH] Removed a unused toolbalr (permeshrendering toolbar???) global Found while searching the horrible mess of the toolbar to get rid of a black box that sometime appears on osx... --- src/meshlab/mainwindow.h | 4 ++-- src/meshlab/mainwindow_Init.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index efe716bab..639947fa0 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -72,8 +72,8 @@ public: std::ptrdiff_t maxgpumem; inline static QString maximumDedicatedGPUMem() {return "MeshLab::System::maxGPUMemDedicatedToGeometry";} - bool permeshtoolbar; - inline static QString perMeshRenderingToolBar() {return "MeshLab::GUI::perMeshToolBar";} +// bool permeshtoolbar; +// inline static QString perMeshRenderingToolBar() {return "MeshLab::GUI::perMeshToolBar";} bool highprecision; inline static QString highPrecisionRendering() {return "MeshLab::System::highPrecisionRendering";} diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 3399a839b..f777bc203 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -1248,7 +1248,7 @@ void MainWindowSetting::initGlobalParameterSet(RichParameterSet* glbset) glbset->addParam(new RichInt(perBatchPrimitives(), 100000, "Per batch primitives loaded in GPU", "Per batch primitives (vertices and faces) loaded in the GPU memory. It's used in order to do not overwhelm the system memory with an entire temporary copy of a mesh.")); glbset->addParam(new RichInt(minPolygonNumberPerSmoothRendering(), 50000, "Default Face number per smooth rendering", "Minimum number of faces in order to automatically render a newly created mesh layer with the per vertex normal attribute activated.")); - glbset->addParam(new RichBool(perMeshRenderingToolBar(), true, "Show Per-Mesh Rendering Side ToolBar", "If true the per-mesh rendering side toolbar will be redendered inside the layerdialog.")); +// glbset->addParam(new RichBool(perMeshRenderingToolBar(), true, "Show Per-Mesh Rendering Side ToolBar", "If true the per-mesh rendering side toolbar will be redendered inside the layerdialog.")); if (MeshLabScalarTest::doublePrecision()) glbset->addParam(new RichBool(highPrecisionRendering(), false, "High Precision Rendering", "If true all the models in the scene will be rendered at the center of the world")); @@ -1260,7 +1260,7 @@ void MainWindowSetting::updateGlobalParameterSet(RichParameterSet& rps) maxgpumem = (std::ptrdiff_t)rps.getInt(maximumDedicatedGPUMem()) * (float)(1024 * 1024); perbatchprimitives = (size_t)rps.getInt(perBatchPrimitives()); minpolygonpersmoothrendering = (size_t)rps.getInt(minPolygonNumberPerSmoothRendering()); - permeshtoolbar = rps.getBool(perMeshRenderingToolBar()); +// permeshtoolbar = rps.getBool(perMeshRenderingToolBar()); highprecision = false; if (MeshLabScalarTest::doublePrecision()) highprecision = rps.getBool(highPrecisionRendering());