From 7d141bd69155fc936907e3e94fd47545e0df8818 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Fri, 9 Oct 2026 22:26:19 +0800 Subject: [PATCH] Keep the texture displacement gizmo out of the assemble view --- src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp | 5 +++++ src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp index 86c2c4e1c6..761de8c6b9 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.cpp @@ -503,6 +503,11 @@ std::string GLGizmoTextureDisplacement::on_get_name() const return _u8L("Texture displacement"); } +bool GLGizmoTextureDisplacement::on_is_activable() const +{ + return m_parent.get_canvas_type() != GLCanvas3D::CanvasAssembleView && GLGizmoPainterBase::on_is_activable(); +} + void GLGizmoTextureDisplacement::on_shutdown() { m_parent.toggle_model_objects_visibility(true); diff --git a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp index 536d331cac..3267ed18a8 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoTextureDisplacement.hpp @@ -208,6 +208,9 @@ public: protected: void on_render_input_window(float x, float y, float bottom_limit) override; std::string on_get_name() const override; + // Never in the assemble view: its toolbar does not offer this gizmo, and every preview here is drawn + // with the main canvas's instance transform. The base alone would let the keyboard shortcut open it there. + bool on_is_activable() const override; wxString handle_snapshot_action_name(bool shift_down, Button button_down) const override;