From f9f2be9936c8f0b297a4d8ab6498b66f372464df Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Thu, 14 Jul 2022 11:07:43 +0200
Subject: [PATCH] Tech ENABLE_RAYCAST_PICKING - Gizmo hollow: fixed crash when
 activating the gizmo

---
 src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp | 23 +++++++++++++++--------
 src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp |  4 ++++
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
index b95d25f2d2..5f99b1acc2 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
@@ -68,16 +68,10 @@ void GLGizmoHollow::data_changed()
 
 void GLGizmoHollow::on_render()
 {
-#if ENABLE_RAYCAST_PICKING
-    if (!m_cylinder.model.is_initialized()) {
-        indexed_triangle_set its = its_make_cylinder(1.0, 1.0);
-        m_cylinder.model.init_from(its);
-        m_cylinder.mesh_raycaster = std::make_unique<MeshRaycaster>(std::make_shared<const TriangleMesh>(std::move(its)));
-    }
-#else
+#if !ENABLE_RAYCAST_PICKING
     if (!m_cylinder.is_initialized())
         m_cylinder.init_from(its_make_cylinder(1.0, 1.0));
-#endif // ENABLE_RAYCAST_PICKING
+#endif // !ENABLE_RAYCAST_PICKING
 
     const Selection& selection = m_parent.get_selection();
     const CommonGizmosDataObjects::SelectionInfo* sel_info = m_c->selection_info();
@@ -111,6 +105,9 @@ void GLGizmoHollow::on_render()
 void GLGizmoHollow::on_register_raycasters_for_picking()
 {
     assert(m_raycasters.empty());
+
+    init_cylinder_model();
+
     set_sla_auxiliary_volumes_picking_state(false);
 
     const CommonGizmosDataObjects::SelectionInfo* info = m_c->selection_info();
@@ -1098,6 +1095,16 @@ void GLGizmoHollow::on_set_hover_id()
         m_hover_id = -1;
 }
 
+#if ENABLE_RAYCAST_PICKING
+void GLGizmoHollow::init_cylinder_model()
+{
+    if (!m_cylinder.model.is_initialized()) {
+        indexed_triangle_set its = its_make_cylinder(1.0, 1.0);
+        m_cylinder.model.init_from(its);
+        m_cylinder.mesh_raycaster = std::make_unique<MeshRaycaster>(std::make_shared<const TriangleMesh>(std::move(its)));
+    }
+}
+#endif // ENABLE_RAYCAST_PICKING
 
 
 
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp b/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp
index 3c16d92880..aa8cdda043 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoHollow.hpp
@@ -127,6 +127,10 @@ protected:
     bool on_is_selectable() const override;
     void on_load(cereal::BinaryInputArchive& ar) override;
     void on_save(cereal::BinaryOutputArchive& ar) const override;
+
+#if ENABLE_RAYCAST_PICKING
+    void init_cylinder_model();
+#endif // ENABLE_RAYCAST_PICKING
 };