MR modification: FORCE_MR: 0->mono 1->multi

CMakeLists.txt

@@ -16,7 +16,7 @@ SET ( WITH_ZINRI ON CACHE BOOL "build CGoGN with Zinri lib  ")
 SET ( WITH_QT ON CACHE BOOL "build CGoGN with Qt lib  ")
 SET ( WITH_NUMERICAL ON CACHE BOOL "build CGoGN with Numerical libs support ")
 # for CGoGN MR
-SET ( FORCE_MR "2" CACHE STRING "0:none / 1 force multi / 2: force mono")
+SET ( FORCE_MR "0" CACHE STRING "0: normal mode / 1 multires mode")
 #create one big lib
 SET ( ONELIB OFF CACHE BOOL "build CGoGN in one lib")
 
@@ -47,12 +47,6 @@ IF (FORCE_MR EQUAL 1)
 	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_mr.h "1" )
 ENDIF (FORCE_MR EQUAL 1)
 
-IF (FORCE_MR EQUAL 2)
-	add_definitions(-DCGoGN_FORCE_MR=2)
-	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_mr.h "2" )
-ENDIF (FORCE_MR EQUAL 2)
-
-
 
 IF (ONELIB)
 	file(WRITE ${CGoGN_ROOT_DIR}/include/cgogn_onelib.h "1" )

apps_cmake.txt

@@ -14,9 +14,6 @@ file(STRINGS ${CGoGN_ROOT_DIR}/include/cgogn_mr.h FORCE_MR)
 IF (FORCE_MR EQUAL 1)
 	add_definitions(-DCGoGN_FORCE_MR=1)
 ENDIF (FORCE_MR EQUAL 1)
-IF (FORCE_MR EQUAL 2)
-	add_definitions(-DCGoGN_FORCE_MR=2)
-ENDIF (FORCE_MR EQUAL 2)
 
 
 # for CGoGN in one lib on not

include/Topology/generic/genericmap.h

@@ -126,11 +126,9 @@ protected:
 	 * is map a multiresolution map
 	 */
 #ifndef CGoGN_FORCE_MR
-	bool m_isMultiRes;
-#elif CGoGN_FORCE_MR == 1
-	static const bool m_isMultiRes = true ;
-#else
 	static const bool m_isMultiRes = false ;
+#else
+	static const bool m_isMultiRes = true ;
 #endif
 
 	/**