Commit a2f2f8b9 authored by Sylvain Thery's avatar Sylvain Thery

bug m_isMultiRes cannot be written if CGoGN_FORCE_MR is defined !

parent ed704c58
...@@ -77,9 +77,8 @@ void MyQT::operation(int x) ...@@ -77,9 +77,8 @@ void MyQT::operation(int x)
if (m_selected != NIL) if (m_selected != NIL)
{ {
dm.markAll(); dm.markAll();
myMap.deleteVertex(m_selected); m_selected=myMap.deleteVertex(m_selected);
updateMap(); updateMap();
m_selected=NIL;
} }
break; break;
case 2: case 2:
...@@ -106,10 +105,9 @@ void MyQT::operation(int x) ...@@ -106,10 +105,9 @@ void MyQT::operation(int x)
if (m_selected != NIL) if (m_selected != NIL)
{ {
PFP::VEC3 M = (position[m_selected] + position[myMap.phi1(m_selected)])/2.0f; PFP::VEC3 M = (position[m_selected] + position[myMap.phi1(m_selected)])/2.0f;
Dart d = myMap.collapseEdge(m_selected,true); m_selected = myMap.collapseEdge(m_selected,true);
position[d] = M; position[m_selected] = M;
updateMap(); updateMap();
m_selected=NIL;
} }
break; break;
case 5: case 5:
......
...@@ -124,7 +124,9 @@ GenericMap::~GenericMap() ...@@ -124,7 +124,9 @@ GenericMap::~GenericMap()
void GenericMap::initMR() void GenericMap::initMR()
{ {
#ifndef CGoGN_FORCE_MR
m_isMultiRes = true; m_isMultiRes = true;
#endif
m_mrattribs.clear(true) ; m_mrattribs.clear(true) ;
m_mrDarts.clear() ; m_mrDarts.clear() ;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment