Commit 42db00a8 authored by TheNumbat's avatar TheNumbat
Browse files

fix bug in resetting bevel offset

parent 887f0302
...@@ -823,10 +823,10 @@ std::string Model::select(Widgets &widgets, Scene_ID click, Vec3 cam, Vec2 spos, ...@@ -823,10 +823,10 @@ std::string Model::select(Widgets &widgets, Scene_ID click, Vec3 cam, Vec2 spos,
std::string err; std::string err;
if (!begin_bevel(err)) { if (!begin_bevel(err)) {
widgets.set_dragging(false, false); widgets.end_drag();
return err; return err;
} else { } else {
widgets.set_dragging(true, true); widgets.start_drag(Halfedge_Mesh::center_of(selected_element().value()), cam, spos, dir);
} }
} else if (!widgets.is_dragging() && click >= n_Widget_IDs) { } else if (!widgets.is_dragging() && click >= n_Widget_IDs) {
......
...@@ -233,11 +233,6 @@ bool Widgets::is_dragging() { return dragging; } ...@@ -233,11 +233,6 @@ bool Widgets::is_dragging() { return dragging; }
bool Widgets::want_drag() { return start_dragging; } bool Widgets::want_drag() { return start_dragging; }
void Widgets::set_dragging(bool drag, bool plane) {
dragging = drag;
drag_plane = plane;
}
void Widgets::start_drag(Vec3 pos, Vec3 cam, Vec2 spos, Vec3 dir) { void Widgets::start_drag(Vec3 pos, Vec3 cam, Vec2 spos, Vec3 dir) {
start_dragging = false; start_dragging = false;
......
...@@ -121,7 +121,6 @@ public: ...@@ -121,7 +121,6 @@ public:
bool want_drag(); bool want_drag();
bool is_dragging(); bool is_dragging();
void set_dragging(bool dragging, bool plane);
private: private:
void generate_lines(Vec3 pos); void generate_lines(Vec3 pos);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment