3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Attempt to fix build on Linux

Browse source
This commit is contained in:
Enrico Turri 2019-04-25 13:35:24 +02:00
parent f52f0f3634
commit 748a4438ba
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/3DScene.cpp
View file

@ -252,7 +252,7 @@ GLVolume::GLVolume(float r, float g, float b, float a)
, zoom_to_volumes(true) , zoom_to_volumes(true)
, shader_outside_printer_detection_enabled(false) , shader_outside_printer_detection_enabled(false)
, is_outside(false) , is_outside(false)
, hover(None) , hover(HS_None)
, is_modifier(false) , is_modifier(false)
, is_wipe_tower(false) , is_wipe_tower(false)
, is_extrusion_path(false) , is_extrusion_path(false)
@ -292,9 +292,9 @@ void GLVolume::set_render_color()
if (force_native_color) if (force_native_color)
set_render_color(color, 4); set_render_color(color, 4);
else { else {
if (hover == Select) if (hover == HS_Select)
set_render_color(HOVER_SELECT_COLOR, 4); set_render_color(HOVER_SELECT_COLOR, 4);
else if (hover == Deselect) else if (hover == HS_Deselect)
set_render_color(HOVER_DESELECT_COLOR, 4); set_render_color(HOVER_DESELECT_COLOR, 4);
else if (selected) else if (selected)
set_render_color(is_outside ? SELECTED_OUTSIDE_COLOR : SELECTED_COLOR, 4); set_render_color(is_outside ? SELECTED_OUTSIDE_COLOR : SELECTED_COLOR, 4);

6
src/slic3r/GUI/3DScene.hpp
View file

@ -236,9 +236,9 @@ public:
enum EHoverState : unsigned char enum EHoverState : unsigned char
{ {
None, HS_None,
Select, HS_Select,
Deselect HS_Deselect
}; };
GLVolume(float r = 1.f, float g = 1.f, float b = 1.f, float a = 1.f); GLVolume(float r = 1.f, float g = 1.f, float b = 1.f, float a = 1.f);

10
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -4274,7 +4274,7 @@ void GLCanvas3D::_update_volumes_hover_state() const
{ {
for (GLVolume* v : m_volumes.volumes) for (GLVolume* v : m_volumes.volumes)
{ {
v->hover = GLVolume::None; v->hover = GLVolume::HS_None;
} }
if (m_hover_volume_idxs.empty()) if (m_hover_volume_idxs.empty())
@ -4295,9 +4295,9 @@ void GLCanvas3D::_update_volumes_hover_state() const
if (volume->is_modifier && ((!deselect && !is_ctrl_pressed) || (deselect && (volume->object_idx() == m_selection.get_object_idx()) && (volume->instance_idx() == m_selection.get_instance_idx())))) if (volume->is_modifier && ((!deselect && !is_ctrl_pressed) || (deselect && (volume->object_idx() == m_selection.get_object_idx()) && (volume->instance_idx() == m_selection.get_instance_idx()))))
{ {
if (deselect) if (deselect)
volume->hover = GLVolume::Deselect; volume->hover = GLVolume::HS_Deselect;
else else
volume->hover = GLVolume::Select; volume->hover = GLVolume::HS_Select;
} }
else else
{ {
@ -4309,9 +4309,9 @@ void GLCanvas3D::_update_volumes_hover_state() const
if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx)) if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx))
{ {
if (deselect) if (deselect)
v->hover = GLVolume::Deselect; v->hover = GLVolume::HS_Deselect;
else else
v->hover = GLVolume::Select; v->hover = GLVolume::HS_Select;
} }
} }
} }