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

Fixed GLCanvas3D::Selection::_ensure_on_bed() method

Browse Source
This commit is contained in:
Enrico Turri 2018-11-23 13:20:04 +01:00
parent 746c1d2fd8
commit f838d8cf18
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1650,7 +1650,6 @@ void GLCanvas3D::Selection::scale(const Vec3d& scale, bool local)
if (!local) if (!local)
{ {
Vec3d offset = m * (m_cache.volumes_data[i].get_volume_position() + m_cache.volumes_data[i].get_instance_position() - m_cache.dragging_center); Vec3d offset = m * (m_cache.volumes_data[i].get_volume_position() + m_cache.volumes_data[i].get_instance_position() - m_cache.dragging_center);
std::cout << to_string(offset) << std::endl;
(*m_volumes)[i]->set_volume_offset(m_cache.dragging_center - m_cache.volumes_data[i].get_instance_position() + offset); (*m_volumes)[i]->set_volume_offset(m_cache.dragging_center - m_cache.volumes_data[i].get_instance_position() + offset);
} }
(*m_volumes)[i]->set_volume_scaling_factor(new_scale); (*m_volumes)[i]->set_volume_scaling_factor(new_scale);
@ -2393,10 +2392,9 @@ void GLCanvas3D::Selection::_ensure_on_bed()
typedef std::map<std::pair<int, int>, double> InstancesToZMap; typedef std::map<std::pair<int, int>, double> InstancesToZMap;
InstancesToZMap instances_min_z; InstancesToZMap instances_min_z;
for (unsigned int i : m_list) for (GLVolume* volume : *m_volumes)
{ {
GLVolume* volume = (*m_volumes)[i]; if (!volume->is_wipe_tower && !volume->is_modifier)
if (!volume->is_modifier)
{ {
double min_z = volume->transformed_convex_hull_bounding_box().min(2); double min_z = volume->transformed_convex_hull_bounding_box().min(2);
std::pair<int, int> instance = std::make_pair(volume->object_idx(), volume->instance_idx()); std::pair<int, int> instance = std::make_pair(volume->object_idx(), volume->instance_idx());