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

Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut

Browse source
This commit is contained in:
YuSanka 2022-06-29 11:44:11 +02:00
commit 89a7f6bdb1
167 changed files with 26900 additions and 24434 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View file

@ -980,7 +980,7 @@ void GLGizmoCut3D::on_render_input_window(float x, float y, float bottom_limit)
// for (Axis axis : {X, Y, Z})
// render_rotation_input(axis);
// m_imgui->text(_L("°"));
// m_imgui->text(_L("°"));
// ImGui::Separator();
@ -1289,7 +1289,7 @@ void GLGizmoCut3D::perform_cut(const Selection& selection)
wxCHECK_RET(instance_idx >= 0 && object_idx >= 0, "GLGizmoCut: Invalid object selection");
// m_cut_z is the distance from the bed. Subtract possible SLA elevation.
const GLVolume* first_glvolume = selection.get_volume(*selection.get_volume_idxs().begin());
const GLVolume* first_glvolume = selection.get_first_volume();
const double object_cut_z = m_plane_center.z() - first_glvolume->get_sla_shift_z();
const Vec3d& instance_offset = wxGetApp().plater()->model().objects[object_idx]->instances[instance_idx]->get_offset();
@ -1412,6 +1412,9 @@ void GLGizmoCut3D::update_connector_shape()
void GLGizmoCut3D::update_model_object() const
{
/* const Selection& selection = m_parent.get_selection();
const GLVolume* first_glvolume = selection.get_first_volume();
const BoundingBoxf3& box = first_glvolume->transformed_convex_hull_bounding_box();*/
const ModelObjectPtrs& mos = wxGetApp().model().objects;
ModelObject* mo = m_c->selection_info()->model_object();
wxGetApp().obj_list()->update_info_items(std::find(mos.begin(), mos.end(), mo) - mos.begin());