]> SALOME platform Git repositories - tools/sat_salome.git/commitdiff
Salome HOME
check SPNS #29944 SHAPER filet patch
authorNabil Ghodbane <nabil.ghodbane@cea.fr>
Thu, 19 May 2022 14:06:46 +0000 (16:06 +0200)
committerNabil Ghodbane <nabil.ghodbane@cea.fr>
Thu, 19 May 2022 14:06:46 +0000 (16:06 +0200)
products/SHAPER.pyconf
products/patches/SPNS_29944.patch [new file with mode: 0644]

index a716a802776ede400affe46bbd7017bce9e287f4..0b5bac66a4cb90bf3c8ba20cbf33ae685dff3d5e 100644 (file)
@@ -45,6 +45,7 @@ default :
         has_unit_tests : "yes"
     }
     cmake_options :   "-DCMAKE_CXX_FLAGS=-fpermissive -DNO_SolveSpace=TRUE -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DADD_COMPATIBILITY_TESTS=ON -DADD_MODELS_TESTS=ON -DADD_HDF_TESTS=ON"
+    patches : ["SPNS_29944.patch"]
 }
 
 default_win :
diff --git a/products/patches/SPNS_29944.patch b/products/patches/SPNS_29944.patch
new file mode 100644 (file)
index 0000000..d8ddb67
--- /dev/null
@@ -0,0 +1,22 @@
+diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+index 6876a337f..65444345e 100644
+--- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp
++++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp
+@@ -73,7 +73,9 @@ void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr&
+   theShape = aSelection->getShape(thePrs);
+   FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
+-  while (aFeature && aFeature->lastResult()->groupName() == ModelAPI_ResultGroup::group()) {
++  while (aFeature.get() &&
++         aFeature->lastResult().get() &&
++         aFeature->lastResult()->groupName() == ModelAPI_ResultGroup::group()) {
+     if (!getObjectFromGroup(theObject, theShape))
+       break;
+     aFeature = ModelAPI_Feature::feature(theObject);
+@@ -297,4 +299,4 @@ bool getObjectFromGroup(ObjectPtr& theObject, GeomShapePtr& theShape)
+     }
+   }
+   return false;
+-}
+\ No newline at end of file
++}