lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

- removed "original MLRenderingData's restored after edit plugin execution feature"

Browse Source
This commit is contained in:
Guido Ranzuglia granzuglia 2016-08-30 05:48:09 +00:00
parent 2f264ce7e2
commit 16050b8eda
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/meshlab/glarea.cpp
View File

@ -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);

26
src/meshlab/glarea.h
View File

@ -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;