From 33002f8ae5d02c099683ff471e29cbdd1e0ab982 Mon Sep 17 00:00:00 2001 From: "zhimin.zeng" Date: Wed, 21 Dec 2022 09:42:50 +0800 Subject: [PATCH] FIX: crash when delete volume in assemble view Change-Id: I72d864a7580165ef6b079e97c2ec30e288152e62 (cherry picked from commit 8b06fe17e0a894c48a083a2a76fe69ea348a5d7a) --- src/slic3r/GUI/3DScene.cpp | 3 +++ src/slic3r/GUI/GUI_ObjectList.hpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp index b8fb18f31..5cbb412e4 100644 --- a/src/slic3r/GUI/3DScene.cpp +++ b/src/slic3r/GUI/3DScene.cpp @@ -695,6 +695,9 @@ void GLVolume::render(bool with_outline) const break; ModelObject* mo = model_objects[object_idx()]; + if (volume_idx() >= mo->volumes.size()) + break; + ModelVolume* mv = mo->volumes[volume_idx()]; if (mv->mmu_segmentation_facets.empty()) break; diff --git a/src/slic3r/GUI/GUI_ObjectList.hpp b/src/slic3r/GUI/GUI_ObjectList.hpp index 35ff3c919..a06482f99 100644 --- a/src/slic3r/GUI/GUI_ObjectList.hpp +++ b/src/slic3r/GUI/GUI_ObjectList.hpp @@ -27,7 +27,7 @@ class ModelConfig; class ModelObject; class ModelVolume; class TriangleMesh; -class TextInfo; +struct TextInfo; enum class ModelVolumeType : int; // FIXME: broken build on mac os because of this is missing: