From ce5e73b94cc5ff140c1d603c6e42ecec4fbd3240 Mon Sep 17 00:00:00 2001 From: nds Date: Thu, 8 Nov 2018 13:05:54 +0300 Subject: [PATCH] Compilation correction for patch: "#265 Possibility to display materials by different hatching style when we make clipping" --- src/AIS/AIS_InteractiveObject.cxx | 4 ++-- src/OpenGl/OpenGl_Group.cxx | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx index 3600b09993..660a820f6a 100644 --- a/src/AIS/AIS_InteractiveObject.cxx +++ b/src/AIS/AIS_InteractiveObject.cxx @@ -649,10 +649,10 @@ void AIS_InteractiveObject::SynchronizeAspects() { if (!aGroupIter.Value().IsNull()) { - Handle(Graphic3d_AspectFillCapping) aCappingAspect = aGrp->FillCappingAspect(); + Handle(Graphic3d_AspectFillCapping) aCappingAspect = aGroupIter.Value()->FillCappingAspect(); if (!aCappingAspect.IsNull()) { - aGrp->SetGroupPrimitivesAspect (aCappingAspect); + aGroupIter.Value()->SetGroupPrimitivesAspect (aCappingAspect); } aGroupIter.ChangeValue()->SynchronizeAspects(); } diff --git a/src/OpenGl/OpenGl_Group.cxx b/src/OpenGl/OpenGl_Group.cxx index 8f468d1539..a4de0f6e74 100644 --- a/src/OpenGl/OpenGl_Group.cxx +++ b/src/OpenGl/OpenGl_Group.cxx @@ -293,6 +293,29 @@ void OpenGl_Group::SynchronizeAspects() } } +// ======================================================================= +// function : SetGroupPrimitivesAspect +// purpose : +// ======================================================================= +void OpenGl_Group::SetGroupPrimitivesAspect (const Handle(Graphic3d_AspectFillCapping)& theAspect) +{ + if (IsDeleted()) + { + return; + } + + if (myAspectFillCapping == NULL) + { + myAspectFillCapping = new OpenGl_CappingPlaneResource (theAspect); + } + else + { + myAspectFillCapping->SetAspect (theAspect); + } + Update(); +} + + // ======================================================================= // function : AddPrimitiveArray // purpose : -- 2.39.5