GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 21:45:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed conflicts after merge with dev branch

Browse Source
This commit is contained in:
enricoturri1966 2022-01-14 11:59:08 +01:00
parent 1c3c7696a6
commit 8057a70b11
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libslic3r/Technologies.hpp
View File

@ -58,13 +58,6 @@
#define ENABLE_PREVIEW_LAYER_TIME (1 && ENABLE_2_5_0_ALPHA1)
// Enable showing time estimate for travel moves in legend
#define ENABLE_TRAVEL_TIME (1 && ENABLE_2_5_0_ALPHA1)
//====================
// 2.5.0.alpha1 techs
//====================
#define ENABLE_2_5_0_ALPHA1 1
// Enable editing volumes transformation in world coordinates and instances in local coordinates
#define ENABLE_WORLD_COORDINATE (1 && ENABLE_2_5_0_ALPHA1)
// Enable showing world coordinates of volumes' offset relative to the instance containing them

2
src/slic3r/GUI/Selection.cpp
View File

@ -2081,7 +2081,7 @@ void Selection::render_sidebar_position_hints(const std::string& sidebar_field)
void Selection::render_sidebar_rotation_hints(const std::string& sidebar_field) const
{
auto render_sidebar_rotation_hint = [this](const std::array<float, 4>& color) {
auto render_sidebar_rotation_hint = [this](const ColorRGBA& color) {
const_cast<GLModel*>(&m_curved_arrow)->set_color(-1, color);
m_curved_arrow.render();
glsafe(::glRotated(180.0, 0.0, 0.0, 1.0));