From 295c40709f7dc38e309958aa9cc8c40dd52581e2 Mon Sep 17 00:00:00 2001
From: "zhou.xu" <zhou.xu@bambulab.com>
Date: Mon, 30 Oct 2023 17:10:12 +0800
Subject: [PATCH] FIX:Imgui's StyleVar not pop according to PushStyleVar

Jira: STUDIO-5000
Change-Id: I4bdafb41404651a19a211e2e1eec78169ff8b9f3
---
 src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp | 1 +
 src/slic3r/GUI/MeshUtils.cpp                 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
index a697f5960..641e787bc 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoAdvancedCut.cpp
@@ -2000,6 +2000,7 @@ void GLGizmoAdvancedCut::render_cut_plane_input_window(float x, float y, float b
     m_imgui->disabled_end();
     ImGui::SameLine();
     const bool reset_clicked = m_imgui->button(_L("Reset"));
+    ImGui::PopStyleVar(2);
     if (reset_clicked) { reset_all(); }
 }
 
diff --git a/src/slic3r/GUI/MeshUtils.cpp b/src/slic3r/GUI/MeshUtils.cpp
index 30f47eba0..9336e27a6 100644
--- a/src/slic3r/GUI/MeshUtils.cpp
+++ b/src/slic3r/GUI/MeshUtils.cpp
@@ -140,11 +140,11 @@ bool MeshClipper::has_valid_contour() const
 }
 
 std::vector<Vec3d> MeshClipper::point_per_contour() const {
-    assert(m_result);
     std::vector<Vec3d> out;
     if (m_result == std::nullopt) {
         return out;
     }
+    assert(m_result);
     for (const CutIsland &isl : m_result->cut_islands) {
         assert(isl.expoly.contour.size() > 2);
         // Now return a point lying inside the contour but not in a hole.