diff --git a/Apps/Tuto/tuto_oper2.cpp b/Apps/Tuto/tuto_oper2.cpp index 9e4688f5404143bfa694b0dd583e2a5087a95794..4003fc5e41aa5540863806d63172ab61b0b3c24a 100644 --- a/Apps/Tuto/tuto_oper2.cpp +++ b/Apps/Tuto/tuto_oper2.cpp @@ -77,9 +77,8 @@ void MyQT::operation(int x) if (m_selected != NIL) { dm.markAll(); - myMap.deleteVertex(m_selected); + m_selected=myMap.deleteVertex(m_selected); updateMap(); - m_selected=NIL; } break; case 2: @@ -106,10 +105,9 @@ void MyQT::operation(int x) if (m_selected != NIL) { PFP::VEC3 M = (position[m_selected] + position[myMap.phi1(m_selected)])/2.0f; - Dart d = myMap.collapseEdge(m_selected,true); - position[d] = M; + m_selected = myMap.collapseEdge(m_selected,true); + position[m_selected] = M; updateMap(); - m_selected=NIL; } break; case 5: diff --git a/src/Topology/generic/genericmap.cpp b/src/Topology/generic/genericmap.cpp index 11df43e70c61dfe0c5741e3124d2586e1f479960..2a5c488638a609a5574b4e443b9cf24f18a99033 100644 --- a/src/Topology/generic/genericmap.cpp +++ b/src/Topology/generic/genericmap.cpp @@ -124,7 +124,9 @@ GenericMap::~GenericMap() void GenericMap::initMR() { +#ifndef CGoGN_FORCE_MR m_isMultiRes = true; +#endif m_mrattribs.clear(true) ; m_mrDarts.clear() ;