Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #1015: The validate icon must be greyed and inactive instead of red and active
[modules/shaper.git]
/
src
/
GeomAPI
/
GeomAPI_DataMapOfShapeShape.cpp
diff --git
a/src/GeomAPI/GeomAPI_DataMapOfShapeShape.cpp
b/src/GeomAPI/GeomAPI_DataMapOfShapeShape.cpp
index 166922710c2e4d7ea9c1366fba1c664c9307e36d..a21ac5f04297702f079461ee8e642134d5239984 100644
(file)
--- a/
src/GeomAPI/GeomAPI_DataMapOfShapeShape.cpp
+++ b/
src/GeomAPI/GeomAPI_DataMapOfShapeShape.cpp
@@
-44,7
+44,9
@@
void GeomAPI_DataMapOfShapeShape::merge(const GeomAPI_DataMapOfShapeShape& theDa
void GeomAPI_DataMapOfShapeShape::merge(const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theDataMap)
{
void GeomAPI_DataMapOfShapeShape::merge(const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theDataMap)
{
- merge(*theDataMap.get());
+ if(theDataMap.get()) {
+ merge(*theDataMap.get());
+ }
}
bool GeomAPI_DataMapOfShapeShape::isBound (std::shared_ptr<GeomAPI_Shape> theKey)
}
bool GeomAPI_DataMapOfShapeShape::isBound (std::shared_ptr<GeomAPI_Shape> theKey)