Fix a problem with TrackIter::block_iter at end of line

[r2c2.git] / source / designer / designer.h

diff --git a/source/designer/designer.h b/source/designer/designer.h
index f22b25c181e161462e2dfd27a560824def6094e7..8348f60d3920d6ac276be5102571a000817cda16 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -24,7 +24,7 @@
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
-#include "trackwrap.h"
+#include "selectionwrap.h"
 
 class Toolbar;
 
@@ -65,10 +65,10 @@ private:
 
        Mode mode;
        Selection selection;
+       SelectionWrap sel_wrap;
        Manipulator manipulator;
        Measure measure;
        CameraController *camera_ctl;
-       TrackWrap *track_wrap;
 
        Msp::Time::TimeStamp last_tick;
 
@@ -115,7 +115,7 @@ private:
        void render();
        void track_added(R2C2::Track &);
        void track_removed(R2C2::Track &);
-       R2C2::Track *pick_track(const R2C2::Vector &);
+       R2C2::Object *pick_object(const R2C2::Vector &);
        void update_track_icon(R2C2::Track3D &);
        void selection_changed();
        void manipulation_status(const std::string &);