diff layer/LayerFactory.cpp @ 963:fa96108d552d osx-retina

Merge from default branch

--- a/layer/LayerFactory.cpp	Wed Apr 29 13:28:44 2015 +0100
+++ b/layer/LayerFactory.cpp	Thu May 14 15:39:47 2015 +0100
@@ -198,7 +198,10 @@
     LayerTypeSet types;
     types.insert(TimeInstants);
     types.insert(TimeValues);
-    types.insert(FlexiNotes);
+    // Because this is strictly a UI function -- list the layer types
+    // to show in a menu -- it should not contain FlexiNotes; the
+    // layer isn't meaningfully editable in SV
+//    types.insert(FlexiNotes);
     types.insert(Notes);
     types.insert(Regions);
     types.insert(Text);