Commit e1e6105c authored by CGoGN GIT Supervisor's avatar CGoGN GIT Supervisor
Browse files

Merge branch 'master' of /home/jund/CGoGN

* 'master' of /home/jund/CGoGN:
  moving an hpp include to the right place
parents c36fcea9 fb38f8f5
...@@ -113,7 +113,9 @@ float scale_to_0_1_around_one_half(float x, float min, float max); ...@@ -113,7 +113,9 @@ float scale_to_0_1_around_one_half(float x, float min, float max);
} // namespace CGoGN } // namespace CGoGN
#include "Utils/colorMaps.hpp"
#endif #endif
#include "Utils/colorMaps.hpp"
...@@ -110,8 +110,8 @@ void Map3::deleteVolume(Dart d) ...@@ -110,8 +110,8 @@ void Map3::deleteVolume(Dart d)
} }
Dart dd = phi3(d) ; Dart dd = phi3(d) ;
Map2::deleteCC(d) ; Map2::deleteCC(d) ; //deleting the volume
Map2::deleteCC(dd) ; Map2::deleteCC(dd) ; //deleting its border (created from the unsew operation)
} }
void Map3::fillHole(Dart d) void Map3::fillHole(Dart d)
......
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