Support using a mesh as a background

[r2c2.git] / source / designer / manipulator.cpp

diff --git a/source/designer/manipulator.cpp b/source/designer/manipulator.cpp
index 34aaf31ffdca2994a876e40985f19ed8d1e3a7e4..798e99f7ebef1c95a47ede24de2daf043480aa6d 100644 (file)
--- a/source/designer/manipulator.cpp
+++ b/source/designer/manipulator.cpp
@@ -221,7 +221,7 @@ void Manipulator::cancel()
                (*i)->check_slope();
 
        angle=0;
-       //snapped=0;
+       wrap_rot=0;
 
        signal_done.emit(false);
 }
@@ -234,7 +234,7 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
        {
                mode=NONE;
                update_wrap();
-               //snapped=0;
+               angle=0;
 
                for(set<Track *>::iterator i=neighbors.begin(); i!=neighbors.end(); ++i)
                        for(vector<MTrack>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
@@ -252,6 +252,9 @@ void Manipulator::button_press(int, int, float, float, unsigned btn)
                                j->track->snap_to(**i, true);
                }
 
+               for(vector<MTrack>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+                       i->rot=i->track->get_rotation();
+
                update_neighbors();
 
                signal_done.emit(true);