1
0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-07-27 10:35:51 +00:00

Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d

# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm
This commit is contained in:
tamasmeszaros
2018-06-28 18:50:39 +02:00
94 changed files with 12419 additions and 4716 deletions
+4 -1
View File
@@ -864,7 +864,10 @@ void ModelObject::clear_instances()
// Returns the bounding box of the transformed instances.
// This bounding box is approximate and not snug.
const BoundingBoxf3& ModelObject::bounding_box()
//========================================================================================================
const BoundingBoxf3& ModelObject::bounding_box() const
//const BoundingBoxf3& ModelObject::bounding_box()
//========================================================================================================
{
if (! m_bounding_box_valid) {
BoundingBoxf3 raw_bbox;