1. Fix for crash on Debian

2. Remove CMake information message about trying to find debug tools

diff --git a/CMakeCommon/FindDFBrowser.cmake b/CMakeCommon/FindDFBrowser.cmake
index 46166288ce521c0f26ab53715b6c40d385b3dec3..74e54563acb5f4e4e2cc76bb3f6959ef38ba6ab5 100644 (file)
--- a/CMakeCommon/FindDFBrowser.cmake
+++ b/CMakeCommon/FindDFBrowser.cmake
@@ -9,10 +9,6 @@
 ## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 #=============================================================================
 
-IF(NOT DFBROWSER_FIND_QUIETLY)
-  MESSAGE(STATUS "Try to find DFBrowser at $ENV{DFBROWSER_ROOT_DIR}...")
-ENDIF()
-
 SET(DFBROWSER_ROOT_DIR $ENV{DFBROWSER_ROOT_DIR} CACHE PATH "Path to the DFBrowser directory")
 IF(EXISTS ${DFBROWSER_ROOT_DIR})
   SET(DFBROWSER_INCLUDE_DIR "${DFBROWSER_ROOT_DIR}/include")

diff --git a/CMakeCommon/FindVInspector.cmake b/CMakeCommon/FindVInspector.cmake
index fcd7db44fc02fde0336cad72361c90521c5eeb50..c86abdf05a7139270b72db40d8e103c3996b146d 100644 (file)
--- a/CMakeCommon/FindVInspector.cmake
+++ b/CMakeCommon/FindVInspector.cmake
@@ -9,10 +9,6 @@
 ## Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 #=============================================================================
 
-IF(NOT VINSPECTOR_FIND_QUIETLY)
-  MESSAGE(STATUS "Try to find VInspector at $ENV{VINSPECTOR_ROOT_DIR}...")
-ENDIF()
-
 SET(VINSPECTOR_ROOT_DIR $ENV{VINSPECTOR_ROOT_DIR} CACHE PATH "Path to the VInspector directory")
 IF(EXISTS $ENV{VINSPECTOR_ROOT_DIR})
   SET(VINSPECTOR_INCLUDE_DIR "$ENV{VINSPECTOR_ROOT_DIR}/include")

diff --git a/src/GeomAPI/GeomAPI_AISObject.cpp b/src/GeomAPI/GeomAPI_AISObject.cpp
index 7f2fd801116d550a4a2752e46ab45659a217ef85..8a3852baaf49ccff4263c87bdf511a44d6f71c16 100644 (file)
--- a/src/GeomAPI/GeomAPI_AISObject.cpp
+++ b/src/GeomAPI/GeomAPI_AISObject.cpp
@@ -316,7 +316,10 @@ void GeomAPI_AISObject::setColor(const int& theColor)
     aDimAIS->DimensionAspect()->SetCommonColor(aColor);
   }
   Handle(AIS_InteractiveContext) aContext = anAIS->GetContext();
-  aContext->SetColor(anAIS, aColor, false);
+  if (!aContext.IsNull())
+    aContext->SetColor(anAIS, aColor, false);
+  else
+    anAIS->SetColor(aColor);
 }
 
 double GeomAPI_AISObject::width()
@@ -358,7 +361,10 @@ bool GeomAPI_AISObject::setColor(int theR, int theG, int theB)
     aDimAIS->DimensionAspect()->SetCommonColor(aColor);
   }
   Handle(AIS_InteractiveContext) aContext = anAIS->GetContext();
-  aContext->SetColor(anAIS, aColor, false);
+  if (!aContext.IsNull())
+    aContext->SetColor(anAIS, aColor, false);
+  else
+    anAIS->SetColor(aColor);
   return true;
 }
 
@@ -464,13 +470,13 @@ bool GeomAPI_AISObject::setLineStyle(int theStyle)
     if (aDrawer->HasOwnWireAspect()) {
       aLineAspect = aDrawer->WireAspect();
     }
-    Quantity_Color aCurrentColor;
-    Aspect_TypeOfLine aCurrentType;
-    Standard_Real aCurrentWidth;
-    aLineAspect->Aspect()->Values(aCurrentColor, aCurrentType, aCurrentWidth);
-    isChanged = aType != aCurrentType;
-    if (isChanged) {
-      aLineAspect->SetTypeOfLine(aType);
+    if (!aLineAspect.IsNull()) {
+      Handle(Graphic3d_AspectLine3d) aGraphicAspect = aLineAspect->Aspect();
+      Aspect_TypeOfLine aCurrentType = aGraphicAspect->Type();
+      isChanged = aType != aCurrentType;
+      if (isChanged) {
+        aLineAspect->SetTypeOfLine(aType);
+      }
     }
   }
   return isChanged;