3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' of https://github.com/Prusa3d/Slic3r

Browse source
This commit is contained in:
bubnikv 2019-01-24 19:09:06 +01:00
commit e1abd1256c
9 changed files with 54 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2173,7 +2173,7 @@ void GLCanvas3D::Selection::render_sidebar_hints(const std::string& sidebar_fiel
if (is_single_full_instance())
{
::glTranslated(center(0), center(1), center(2));
if (boost::starts_with(sidebar_field, "scale") || boost::starts_with(sidebar_field, "size"))
if (!boost::starts_with(sidebar_field, "position"))
{
Transform3d orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
::glMultMatrixd(orient_matrix.data());
@ -2182,9 +2182,7 @@ void GLCanvas3D::Selection::render_sidebar_hints(const std::string& sidebar_fiel
else if (is_single_volume() || is_single_modifier())
{
Transform3d orient_matrix = (*m_volumes)[*m_list.begin()]->get_instance_transformation().get_matrix(true, false, true, true);
const Vec3d& offset = get_bounding_box().center();
::glTranslated(offset(0), offset(1), offset(2));
::glTranslated(center(0), center(1), center(2));
::glMultMatrixd(orient_matrix.data());
}
else