From ede18d20b95c185dd333fd3382725fb3450c29db Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 2 Aug 2022 19:09:05 +0200 Subject: [PATCH] Fem: [skip ci] replace the SoAnnotation with an SoSeparator to fix rendering artifacts for non-convex objects --- src/Mod/Fem/Gui/ViewProviderAnalysis.cpp | 4 ++-- src/Mod/Fem/Gui/ViewProviderAnalysis.h | 4 +--- src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp | 8 -------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp index e865ab39f5..5077f8f22d 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp @@ -28,7 +28,7 @@ # include # include # include -# include +# include #endif #include @@ -58,7 +58,7 @@ using namespace FemGui; ViewProviderFemHighlighter::ViewProviderFemHighlighter() { - annotate = new SoAnnotation(); + annotate = new SoSeparator(); annotate->ref(); } diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.h b/src/Mod/Fem/Gui/ViewProviderAnalysis.h index fa50cf6e06..6036cf98fc 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.h +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.h @@ -28,8 +28,6 @@ #include #include -class SoAnnotation; - namespace FemGui { @@ -45,7 +43,7 @@ public: void highlightView(Gui::ViewProviderDocumentObject*); private: - SoAnnotation* annotate; + SoSeparator* annotate; }; class FemGuiExport ViewProviderFemAnalysis : public Gui::ViewProviderDocumentObjectGroup diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp index f3f5465442..4c2ae1793c 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp @@ -22,10 +22,6 @@ #include "PreCompiled.h" -#ifndef _PreComp_ -# include -#endif - #include #include #include @@ -44,10 +40,6 @@ PROPERTY_SOURCE(FemGui::ViewProviderFemPostPipeline, FemGui::ViewProviderFemPost ViewProviderFemPostPipeline::ViewProviderFemPostPipeline() { sPixmap = "FEM_PostPipelineFromResult"; - - // Fixes rendering issue with the annotation node - m_shapeHints->vertexOrdering = SoShapeHints::CLOCKWISE; - m_shapeHints->shapeType = SoShapeHints::SOLID; } ViewProviderFemPostPipeline::~ViewProviderFemPostPipeline()