From e1586f5c510bd772d95e498c60185b59441dae63 Mon Sep 17 00:00:00 2001
From: mpv <mpv@opencascade.com>
Date: Fri, 30 Mar 2018 15:16:36 +0300
Subject: [PATCH] Fix of crash on initialization of the Viewer in SALOME

---
 src/ModuleBase/ModuleBase_Tools.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp
index bd50ee687..10f191b27 100755
--- a/src/ModuleBase/ModuleBase_Tools.cpp
+++ b/src/ModuleBase/ModuleBase_Tools.cpp
@@ -1143,6 +1143,8 @@ void setPointBallHighlighting(AIS_Shape* theAIS)
   Handle(Graphic3d_AspectMarker3d) anAspect;
   Handle(Prs3d_Drawer) aDrawer = theAIS->DynamicHilightAttributes();
   if (aDrawer.IsNull()) {
+    if (ModuleBase_IViewer::DefaultHighlightDrawer.IsNull())
+      return;
     aDrawer = new Prs3d_Drawer(*ModuleBase_IViewer::DefaultHighlightDrawer);
     if (!aDrawer->HasOwnPointAspect()) {
       aDrawer->SetPointAspect(new Prs3d_PointAspect(Aspect_TOM_BALL, Quantity_NOC_BLACK, 2.0));
-- 
2.39.2