GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-14 06:55:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crash when opening Measure Gizmo after slicing in SLA mode

Browse Source
This commit is contained in:
enricoturri1966 2022-11-21 14:44:31 +01:00
parent ab5c81a2ef
commit df266798a6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/slic3r/GUI/Gizmos/GLGizmoMeasure.cpp
View File

@ -968,7 +968,7 @@ void GLGizmoMeasure::update_if_needed()
// continue; // continue;
TriangleMesh volume_mesh = vol.volume->mesh(); TriangleMesh volume_mesh = vol.volume->mesh();
volume_mesh.transform(vol.instance->get_transformation().get_matrix() * vol.volume->get_transformation().get_matrix()); volume_mesh.transform(vol.world_trafo);
composite_mesh.merge(volume_mesh); composite_mesh.merge(volume_mesh);
} }
@ -987,10 +987,17 @@ void GLGizmoMeasure::update_if_needed()
volumes_cache.reserve(idxs.size()); volumes_cache.reserve(idxs.size());
for (unsigned int idx : idxs) { for (unsigned int idx : idxs) {
const GLVolume* v = selection.get_volume(idx); const GLVolume* v = selection.get_volume(idx);
const int volume_idx = v->volume_idx();
if (volume_idx < 0)
continue;
const ModelObject* obj = selection.get_model()->objects[v->object_idx()]; const ModelObject* obj = selection.get_model()->objects[v->object_idx()];
const ModelInstance* inst = obj->instances[v->instance_idx()]; const ModelInstance* inst = obj->instances[v->instance_idx()];
const ModelVolume* vol = obj->volumes[v->volume_idx()]; const ModelVolume* vol = obj->volumes[volume_idx];
const VolumeCacheItem item = { obj, inst, vol, inst->get_matrix() * vol->get_matrix() }; const VolumeCacheItem item = {
obj, inst, vol,
Geometry::translation_transform(selection.get_first_volume()->get_sla_shift_z() * Vec3d::UnitZ()) * inst->get_matrix() * vol->get_matrix()
};
volumes_cache.emplace_back(item); volumes_cache.emplace_back(item);
} }