From 748a4438ba15d94fd34332028b5361b9450aac1b Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Thu, 25 Apr 2019 13:35:24 +0200 Subject: [PATCH] Attempt to fix build on Linux --- src/slic3r/GUI/3DScene.cpp | 6 +++--- src/slic3r/GUI/3DScene.hpp | 6 +++--- src/slic3r/GUI/GLCanvas3D.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index 873c8b9e6..c96798c6f 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -252,7 +252,7 @@ GLVolume::GLVolume(float r, float g, float b, float a) , zoom_to_volumes(true) , shader_outside_printer_detection_enabled(false) , is_outside(false) - , hover(None) + , hover(HS_None) , is_modifier(false) , is_wipe_tower(false) , is_extrusion_path(false) @@ -292,9 +292,9 @@ void GLVolume::set_render_color() if (force_native_color) set_render_color(color, 4); else { - if (hover == Select) + if (hover == HS_Select) set_render_color(HOVER_SELECT_COLOR, 4); - else if (hover == Deselect) + else if (hover == HS_Deselect) set_render_color(HOVER_DESELECT_COLOR, 4); else if (selected) set_render_color(is_outside ? SELECTED_OUTSIDE_COLOR : SELECTED_COLOR, 4); diff --git a/src/slic3r/GUI/3DScene.hpp b/src/slic3r/GUI/3DScene.hpp index 8ed8da43f..377d89fe7 100644 --- a/src/slic3r/GUI/3DScene.hpp +++ b/src/slic3r/GUI/3DScene.hpp @@ -236,9 +236,9 @@ public: enum EHoverState : unsigned char { - None, - Select, - Deselect + HS_None, + HS_Select, + HS_Deselect }; GLVolume(float r = 1.f, float g = 1.f, float b = 1.f, float a = 1.f); diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index 20babc470..c86ca594c 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -4274,7 +4274,7 @@ void GLCanvas3D::_update_volumes_hover_state() const { for (GLVolume* v : m_volumes.volumes) { - v->hover = GLVolume::None; + v->hover = GLVolume::HS_None; } 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 (deselect) - volume->hover = GLVolume::Deselect; + volume->hover = GLVolume::HS_Deselect; else - volume->hover = GLVolume::Select; + volume->hover = GLVolume::HS_Select; } else { @@ -4309,9 +4309,9 @@ void GLCanvas3D::_update_volumes_hover_state() const if ((v->object_idx() == object_idx) && (v->instance_idx() == instance_idx)) { if (deselect) - v->hover = GLVolume::Deselect; + v->hover = GLVolume::HS_Deselect; else - v->hover = GLVolume::Select; + v->hover = GLVolume::HS_Select; } } }