From 16050b8eda3bb2f0c008434e809f851b3ba3fa3a Mon Sep 17 00:00:00 2001
From: Guido Ranzuglia granzuglia <guido.ranzuglia@isti.cnr.it>
Date: Tue, 30 Aug 2016 05:48:09 +0000
Subject: [PATCH] - removed "original MLRenderingData's restored after edit
 plugin execution feature"

---
 src/meshlab/glarea.cpp |  8 +++++---
 src/meshlab/glarea.h   | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/meshlab/glarea.cpp b/src/meshlab/glarea.cpp
index 6c2ee3b98..a02e91765 100644
--- a/src/meshlab/glarea.cpp
+++ b/src/meshlab/glarea.cpp
@@ -1036,8 +1036,8 @@ void GLArea::setCurrentEditAction(QAction *editAction)
 
     lastModelEdited = this->md()->mm();
 
-	_oldvalues.clear();
-	parentmultiview->sharedDataContext()->getRenderInfoPerMeshView(context(), _oldvalues);
+	/*_oldvalues.clear();
+	parentmultiview->sharedDataContext()->getRenderInfoPerMeshView(context(), _oldvalues);*/
 
 	MLRenderingData dt;
 	if (iEdit->isSingleMeshEdit())
@@ -1046,6 +1046,7 @@ void GLArea::setCurrentEditAction(QAction *editAction)
 		{
 			parentmultiview->sharedDataContext()->getRenderInfoPerMeshView(md()->mm()->id(), context(), dt);
 			iEdit->suggestedRenderingData(*(md()->mm()), dt);
+			MLPoliciesStandAloneFunctions::disableRedundatRenderingDataAccordingToPriorities(md()->mm(), dt);
 			parentmultiview->sharedDataContext()->setRenderingDataPerMeshView(md()->mm()->id(), context(), dt);
 			parentmultiview->sharedDataContext()->manageBuffers(md()->mm()->id());
 		}
@@ -1058,13 +1059,14 @@ void GLArea::setCurrentEditAction(QAction *editAction)
 			{
 				parentmultiview->sharedDataContext()->getRenderInfoPerMeshView(mm->id(), context(), dt);
 				iEdit->suggestedRenderingData(*(mm), dt);
+				MLPoliciesStandAloneFunctions::disableRedundatRenderingDataAccordingToPriorities(mm, dt);
 				parentmultiview->sharedDataContext()->setRenderingDataPerMeshView(mm->id(), context(), dt);
 				parentmultiview->sharedDataContext()->manageBuffers(mm->id());
 			}
 		}
 	}
 	if (mw() != NULL)
-		mw()->updateLayerTable();
+		mw()->updateLayerDialog();
     if (!iEdit->StartEdit(*this->md(), this,parentmultiview->sharedDataContext()))
     {
         //iEdit->EndEdit(*(this->md()->mm()), this);
diff --git a/src/meshlab/glarea.h b/src/meshlab/glarea.h
index 4569290f0..c965abd35 100644
--- a/src/meshlab/glarea.h
+++ b/src/meshlab/glarea.h
@@ -65,7 +65,7 @@ public:
 private:
     int id;  //the very important unique id of each subwindow.
     MultiViewer_Container* parentmultiview;
-	MLSceneGLSharedDataContext::PerMeshRenderingDataMap  _oldvalues;
+	//MLSceneGLSharedDataContext::PerMeshRenderingDataMap  _oldvalues;
 
 public:
     int getId() {return id;}
@@ -221,19 +221,19 @@ public slots:
 				iEdit->EndEdit(*mm(), this, parentmultiview->sharedDataContext());
         }
 		
-		MLSceneGLSharedDataContext* shared;
-		if ((parentmultiview != NULL) && (parentmultiview->sharedDataContext() != NULL))
-			shared = parentmultiview->sharedDataContext();
+		//MLSceneGLSharedDataContext* shared;
+		//if ((parentmultiview != NULL) && (parentmultiview->sharedDataContext() != NULL))
+		//	shared = parentmultiview->sharedDataContext();
 
-		if (shared != NULL)
-		{
-			for (MLSceneGLSharedDataContext::PerMeshRenderingDataMap::iterator it = _oldvalues.begin(); it != _oldvalues.end(); ++it)
-			{
-				shared->setRenderingDataPerMeshView(it.key(), context(), it.value());
-				shared->manageBuffers(it.key());
-			}
-		}
-		_oldvalues.clear();
+		//if (shared != NULL)
+		//{
+		//	for (MLSceneGLSharedDataContext::PerMeshRenderingDataMap::iterator it = _oldvalues.begin(); it != _oldvalues.end(); ++it)
+		//	{
+		//		shared->setRenderingDataPerMeshView(it.key(), context(), it.value());
+		//		shared->manageBuffers(it.key());
+		//	}
+		//}
+		//_oldvalues.clear();
 
         iEdit= 0;
         currentEditor=0;