OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0029062: Visualization, SelectMgr_ViewerSelector - add NULL-check within ::checkOverlap() method

Browse Source
This commit is contained in:
kgv 2017-09-19 10:02:37 +03:00
parent 08b183fe0b
commit b1c235dfce
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SelectMgr/SelectMgr_ViewerSelector.cxx
View File

@ -177,6 +177,9 @@ void SelectMgr_ViewerSelector::checkOverlap (const Handle(SelectBasics_Sensitive
if (!anOwner.IsNull()) if (!anOwner.IsNull())
{ {
aSelectable = anOwner->Selectable(); aSelectable = anOwner->Selectable();
}
if (!aSelectable.IsNull())
{
if (!aSelectable->ClipPlanes().IsNull() if (!aSelectable->ClipPlanes().IsNull()
&& aSelectable->ClipPlanes()->ToOverrideGlobal()) && aSelectable->ClipPlanes()->ToOverrideGlobal())
{ {
@ -231,6 +234,7 @@ void SelectMgr_ViewerSelector::checkOverlap (const Handle(SelectBasics_Sensitive
} }
if (HasDepthClipping (anOwner) if (HasDepthClipping (anOwner)
&& !aSelectable.IsNull()
&& theMgr.GetActiveSelectionType() == SelectMgr_SelectingVolumeManager::Point) && theMgr.GetActiveSelectionType() == SelectMgr_SelectingVolumeManager::Point)
{ {
Standard_Boolean isClipped = mySelectingVolumeMgr.IsClipped (*aSelectable->ClipPlanes(), Standard_Boolean isClipped = mySelectingVolumeMgr.IsClipped (*aSelectable->ClipPlanes(),
@ -240,7 +244,7 @@ void SelectMgr_ViewerSelector::checkOverlap (const Handle(SelectBasics_Sensitive
} }
SelectMgr_SortCriterion aCriterion; SelectMgr_SortCriterion aCriterion;
myZLayerOrderMap.Find (aSelectable->ZLayer(), aCriterion.ZLayerPosition); myZLayerOrderMap.Find (!aSelectable.IsNull() ? aSelectable->ZLayer() : Graphic3d_ZLayerId_Default, aCriterion.ZLayerPosition);
aCriterion.Entity = theEntity; aCriterion.Entity = theEntity;
aCriterion.Priority = anOwner->Priority(); aCriterion.Priority = anOwner->Priority();
aCriterion.Depth = aPickResult.Depth(); aCriterion.Depth = aPickResult.Depth();