Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Courses
Scotty3D
Commits
42db00a8
Commit
42db00a8
authored
Oct 05, 2020
by
TheNumbat
Browse files
fix bug in resetting bevel offset
parent
887f0302
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/gui/model.cpp
View file @
42db00a8
...
...
@@ -823,10 +823,10 @@ std::string Model::select(Widgets &widgets, Scene_ID click, Vec3 cam, Vec2 spos,
std
::
string
err
;
if
(
!
begin_bevel
(
err
))
{
widgets
.
set
_drag
ging
(
false
,
false
);
widgets
.
end
_drag
(
);
return
err
;
}
else
{
widgets
.
s
e
t_drag
ging
(
true
,
true
);
widgets
.
s
tar
t_drag
(
Halfedge_Mesh
::
center_of
(
selected_element
().
value
()),
cam
,
spos
,
dir
);
}
}
else
if
(
!
widgets
.
is_dragging
()
&&
click
>=
n_Widget_IDs
)
{
...
...
src/gui/widgets.cpp
View file @
42db00a8
...
...
@@ -233,11 +233,6 @@ bool Widgets::is_dragging() { return 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
)
{
start_dragging
=
false
;
...
...
src/gui/widgets.h
View file @
42db00a8
...
...
@@ -121,7 +121,6 @@ public:
bool
want_drag
();
bool
is_dragging
();
void
set_dragging
(
bool
dragging
,
bool
plane
);
private:
void
generate_lines
(
Vec3
pos
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment