]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'asozinov/subshape_color' into dish/CR35154--Edge_Thickness
authordish <dmitrii.shvydkoi@opencascade.com>
Tue, 11 Jun 2024 21:22:49 +0000 (21:22 +0000)
committerdish <dmitrii.shvydkoi@opencascade.com>
Tue, 11 Jun 2024 21:22:49 +0000 (21:22 +0000)
commit077072f0536fa935f0e2f50736eb3b75b9fe03af
tree19e15f79d6f40619bcbdefda63302ca80e6aa9e8
parenteae3ef69195f14b88b1a38a213d0c1c2ec3ed7b8
parent846ad333cf85df23c6f40d5d226b9d7fe59caf15
Merge branch 'asozinov/subshape_color' into dish/CR35154--Edge_Thickness

# Conflicts:
# src/Model/Model_Objects.cpp
# src/Model/Model_Objects.h
# src/Model/Model_ResultBody.cpp
# src/Model/Model_ResultPart.cpp
# src/Model/Model_ResultPart.h
# src/ModelAPI/ModelAPI_ResultPart.h
# src/ModelAPI/ModelAPI_Tools.cpp
# src/ModelAPI/ModelAPI_Tools.h
# src/ModelHighAPI/ModelHighAPI_Dumper.cpp
# src/PartSet/PartSet_Module.cpp
# src/XGUI/XGUI_Selection.h
22 files changed:
src/GeomAPI/GeomAPI_AISObject.cpp
src/GeomAPI/GeomAPI_AISObject.h
src/Model/Model_Document.h
src/Model/Model_Objects.cpp
src/Model/Model_Objects.h
src/Model/Model_ResultBody.cpp
src/Model/Model_ResultBody.h
src/Model/Model_ResultPart.cpp
src/Model/Model_ResultPart.h
src/ModelAPI/ModelAPI_Document.h
src/ModelAPI/ModelAPI_ResultBody.h
src/ModelAPI/ModelAPI_ResultPart.h
src/ModelAPI/ModelAPI_Tools.cpp
src/ModelAPI/ModelAPI_Tools.h
src/ModelHighAPI/ModelHighAPI_Dumper.cpp
src/ModelHighAPI/ModelHighAPI_Dumper.h
src/ModelHighAPI/ModelHighAPI_Selection.cpp
src/ModelHighAPI/ModelHighAPI_Selection.h
src/PartSet/PartSet_Module.cpp
src/XGUI/XGUI_Displayer.cpp
src/XGUI/XGUI_Workshop.cpp
src/XGUI/XGUI_Workshop.h