Index: trunk/src/Dam/Forms/DamGeometryEditor.cs
===================================================================
diff -u -r7 -r29
--- trunk/src/Dam/Forms/DamGeometryEditor.cs	(.../DamGeometryEditor.cs)	(revision 7)
+++ trunk/src/Dam/Forms/DamGeometryEditor.cs	(.../DamGeometryEditor.cs)	(revision 29)
@@ -50,8 +50,7 @@
             geometryEditor.MainBar.LinksPersistInfo.Add(new LinkPersistInfo(nextButton));
             geometryEditor.MainBar.LinksPersistInfo.Add(new LinkPersistInfo(probabilityItem));
             geometryEditor.MainBar.LinksPersistInfo.Add(new LinkPersistInfo(soilProfileLabel));
-//            geometryEditor.MainBar.LinksPersistInfo.Insert(2, new LinkPersistInfo(editMode)); //TODO enable line to re-enable editing of characteristic points
-
+            geometryEditor.MainBar.LinksPersistInfo.Insert(2, new LinkPersistInfo(editMode)); //TODO disabled line editing of characteristic points (MWDAM-915)
             BindSupport.Bind(panel, projectTypeBarItem, spatialEditor.GetType(), StaticReflection.GetMemberName<DamSpatialEditorDecorator>(x => x.FailureMechanismType));
             BindSupport.Bind(panel, previousButton, spatialEditor.GetType(), StaticReflection.GetMemberName<DamSpatialEditorDecorator>(x => x.Previous()));
             BindSupport.Bind(panel, nextButton, spatialEditor.GetType(), StaticReflection.GetMemberName<DamSpatialEditorDecorator>(x => x.Next()));
Index: trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs
===================================================================
diff -u -r7 -r29
--- trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs	(.../DamSpatialEditorDecorator.cs)	(revision 7)
+++ trunk/src/Dam/Forms/DamSpatialEditorDecorator.cs	(.../DamSpatialEditorDecorator.cs)	(revision 29)
@@ -109,7 +109,7 @@
             DisableSelectionOfNonEditableShapes();
 
             // Disable edit mode, because now it is not stable enough (MWDAM-915)
-            decoratedSpatialEditor.GetShapeInfo(typeof(DrawingCharacteristicPoint)).AllowSelect = false;
+            decoratedSpatialEditor.GetShapeInfo(typeof(DrawingCharacteristicPoint)).AllowSelect = true;
 
             EditMode = false;