Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
Scotty3D
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Courses
Scotty3D
Commits
42db00a8
There was an error fetching the commit references. Please try again later.
Commit
42db00a8
authored
4 years ago
by
TheNumbat
Browse files
Options
Downloads
Patches
Plain Diff
fix bug in resetting bevel offset
parent
887f0302
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/gui/model.cpp
+2
-2
2 additions, 2 deletions
src/gui/model.cpp
src/gui/widgets.cpp
+0
-5
0 additions, 5 deletions
src/gui/widgets.cpp
src/gui/widgets.h
+0
-1
0 additions, 1 deletion
src/gui/widgets.h
with
2 additions
and
8 deletions
src/gui/model.cpp
+
2
−
2
View file @
42db00a8
...
@@ -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
_drag
ging
(
false
,
false
);
widgets
.
end
_drag
(
);
return
err
;
return
err
;
}
else
{
}
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
)
{
}
else
if
(
!
widgets
.
is_dragging
()
&&
click
>=
n_Widget_IDs
)
{
...
...
This diff is collapsed.
Click to expand it.
src/gui/widgets.cpp
+
0
−
5
View file @
42db00a8
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
src/gui/widgets.h
+
0
−
1
View file @
42db00a8
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment