From d5e9dffc95531d4af33ee1dc792e57366d5b7d8e Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Thu, 28 Nov 2024 17:50:21 +0800 Subject: [PATCH] FIX:reedit text should save text font version jira: STUDIO-8995 Change-Id: I4edbcc4de5391fe8ebbd9c0b79b99cbaee9ecfee (cherry picked from commit d9510ef205df7fc0f115cbea92e94f6b5feb5c5a) --- src/slic3r/GUI/Gizmos/GLGizmoText.cpp | 5 ++++- src/slic3r/GUI/Gizmos/GLGizmoText.hpp | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp index 94ca1025e..b162d0589 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.cpp @@ -572,7 +572,9 @@ void GLGizmoText::load_init_text() } } else if (!temp_ray_caster.get_closest_point_and_normal(local_center, -direction, &closest_pt, &temp_normal, &face_id)) { - m_show_warning_error_mesh = true; + if (!temp_ray_caster.get_closest_point_and_normal(local_center, direction, &closest_pt, &temp_normal, &face_id)) { + m_show_warning_error_mesh = true; + } } } // m_rr.mesh_id @@ -1872,6 +1874,7 @@ void GLGizmoText::generate_text_volume(bool is_temp) if (!is_temp) { plater->take_snapshot("Modify Text"); } + text_info.m_font_version = CUR_FONT_VERSION; ModelVolume * model_volume = model_object->volumes[m_volume_idx]; ModelVolume * new_model_volume = model_object->add_volume(std::move(mesh),false); if (m_need_fix && // m_reedit_text//m_need_fix diff --git a/src/slic3r/GUI/Gizmos/GLGizmoText.hpp b/src/slic3r/GUI/Gizmos/GLGizmoText.hpp index 3cc8d018a..a4c763d7c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoText.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoText.hpp @@ -16,13 +16,14 @@ namespace GUI { //#define DEBUG_TEXT //#define DEBUG_TEXT_VALUE enum class SLAGizmoEventType : unsigned char; +const std::string CUR_FONT_VERSION = "1.0"; class GLGizmoText : public GLGizmoBase { private: std::vector m_avail_font_names; char m_text[1024] = { 0 }; std::string m_font_name; - std::string m_font_version{"1.0"}; + std::string m_font_version = CUR_FONT_VERSION; float m_font_size = 16.f; const float m_font_size_min = 3.f; const float m_font_size_max = 1000.f;