--

--HG--
branch : develop

src/libs/vmisc/def.h

@@ -35,16 +35,11 @@
 
 #define SceneSize 50000
 #define DefPointRadius 1.5//mm
+
 enum class NodeDetail : char { Contour, Modeling };
 enum class SceneObject : char { Point, Line, Spline, Arc, SplinePath, Detail, Unknown };
-#ifdef STUPIDMERGE
-enum class MeasurementsType : char { Standard, Individual, Unknown };
-enum class Unit : char { Mm, Cm, Inch, Px };
-#endif
-
 enum class MeasurementsType : char { Standard, Individual , Unknown};
 enum class Unit : char { Mm = 0, Cm, Inch, Px, LAST_UNIT_DO_NOT_USE};
-
 enum class Source : char { FromGui, FromFile, FromTool };
 
 enum class Tool : unsigned char