3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-26 16:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Fix Compile Warnings (#5963)"

Browse source 
This reverts commit b83e16dbdd.

Found regressions like auto orientation didn't work anymore after this change, revert it
This commit is contained in:
SoftFever 2024-08-12 00:00:20 +08:00
parent 0286c36f42
commit 7082e945b1
184 changed files with 1091 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/slic3r/GUI/Selection.cpp
View file

@ -1110,6 +1110,7 @@ void Selection::move_to_center(const Vec3d& displacement, bool local)
if (!m_valid)
return;
EMode translation_type = m_mode;
//BOOST_LOG_TRIVIAL(debug) << __FUNCTION__ << boost::format(": %1%, displacement {%2%, %3%, %4%}") % __LINE__ % displacement(X) % displacement(Y) % displacement(Z);
set_caches();
@ -1130,6 +1131,7 @@ void Selection::move_to_center(const Vec3d& displacement, bool local)
else {
const Vec3d local_displacement = (m_cache.volumes_data[i].get_instance_rotation_matrix() * m_cache.volumes_data[i].get_instance_scale_matrix() * m_cache.volumes_data[i].get_instance_mirror_matrix()).inverse() * displacement;
v.set_volume_offset(m_cache.volumes_data[i].get_volume_position() + local_displacement);
translation_type = Volume;
}
}
}
@ -2183,8 +2185,7 @@ void Selection::update_type()
obj_it->second.insert(inst_idx);
}
// BBL removed functionality below
// bool requires_disable = false;
bool requires_disable = false;
if (!m_valid)
m_type = Invalid;
@ -2200,7 +2201,7 @@ void Selection::update_type()
else if (first->is_modifier)
{
m_type = SingleModifier;
// requires_disable = true;
requires_disable = true;
}
else
{
@ -2222,7 +2223,7 @@ void Selection::update_type()
else
{
m_type = SingleVolume;
// requires_disable = true;
requires_disable = true;
}
}
}
@ -2270,7 +2271,7 @@ void Selection::update_type()
else if (modifiers_count == (unsigned int)m_list.size())
m_type = MultipleModifier;
// requires_disable = true;
requires_disable = true;
}
}
else if ((selected_instances_count > 1) && (selected_instances_count * model_volumes_count + sla_volumes_count == (unsigned int)m_list.size()))