diff layer/FlexiNoteLayer.cpp @ 860:4a5d144bd5d0 tonioni

Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents 5d4e3e36945f
children 7a80fa6a6dfc e0f08e108064
line wrap: on
line diff
--- a/layer/FlexiNoteLayer.cpp	Tue Sep 02 16:23:48 2014 +0100
+++ b/layer/FlexiNoteLayer.cpp	Tue Sep 09 16:36:21 2014 +0100
@@ -62,8 +62,14 @@
     m_model(0),
     m_editing(false),
     m_intelligentActions(true),
+    m_dragPointX(0),
+    m_dragPointY(0),
+    m_dragStartX(0),
+    m_dragStartY(0),
     m_originalPoint(0, 0.0, 0, 1.f, tr("New Point")),
     m_editingPoint(0, 0.0, 0, 1.f, tr("New Point")),
+    m_greatestLeftNeighbourFrame(0),
+    m_smallestRightNeighbourFrame(0),
     m_editingCommand(0),
     m_verticalScale(AutoAlignScale),
     m_editMode(DragNote),