]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge remote-tracking branch 'remotes/origin/occ/compounds_processing' V9_5_0a1
authorazv <azv@opencascade.com>
Wed, 26 Feb 2020 13:22:38 +0000 (16:22 +0300)
committerazv <azv@opencascade.com>
Wed, 26 Feb 2020 13:22:38 +0000 (16:22 +0300)
# Conflicts:
# src/FeaturesPlugin/CMakeLists.txt

1  2 
src/FeaturesPlugin/CMakeLists.txt
src/Model/Model_Data.cpp
src/ModelAPI/ModelAPI_Tools.cpp
src/ModelAPI/ModelAPI_Tools.h
src/ModelHighAPI/ModelHighAPI_Dumper.cpp

index 45dd74930e910a40b131809ca3047df80771cdfb,e472d6fc1e3904be345c51b6504e9a18616878cc..dea751490ab701ff1b63bb004f9e585246474e29
@@@ -568,5 -570,89 +570,90 @@@ ADD_UNIT_TESTS(TestExtrusion.p
                 TestDefeaturing_OnCompound.py
                 Test3137_1.py
                 Test3137_2.py
 +               Test2918.py
+                Test3139.py
+                TestPlacement_MultiLevelCompound_v0_1.py
+                TestPlacement_MultiLevelCompound_v0_2.py
+                TestPlacement_MultiLevelCompound_v0_3.py
+                TestPlacement_MultiLevelCompound_v0_4.py
+                TestPlacement_MultiLevelCompound_v0_5.py
+                TestPlacement_MultiLevelCompound_v0_6.py
+                TestPlacement_MultiLevelCompound_v95_1.py
+                TestPlacement_MultiLevelCompound_v95_2.py
+                TestPlacement_MultiLevelCompound_v95_3.py
+                TestPlacement_MultiLevelCompound_v95_4.py
+                TestPlacement_MultiLevelCompound_v95_5.py
+                TestPlacement_MultiLevelCompound_v95_6.py
+                TestTranslation_MultiLevelCompound_v0_1.py
+                TestTranslation_MultiLevelCompound_v0_2.py
+                TestTranslation_MultiLevelCompound_v0_3.py
+                TestTranslation_MultiLevelCompound_v0_4.py
+                TestTranslation_MultiLevelCompound_v0_5.py
+                TestTranslation_MultiLevelCompound_v95_1.py
+                TestTranslation_MultiLevelCompound_v95_2.py
+                TestTranslation_MultiLevelCompound_v95_3.py
+                TestTranslation_MultiLevelCompound_v95_4.py
+                TestTranslation_MultiLevelCompound_v95_5.py
+                TestRotation_MultiLevelCompound_v0_1.py
+                TestRotation_MultiLevelCompound_v0_2.py
+                TestRotation_MultiLevelCompound_v0_3.py
+                TestRotation_MultiLevelCompound_v0_4.py
+                TestRotation_MultiLevelCompound_v95_1.py
+                TestRotation_MultiLevelCompound_v95_2.py
+                TestRotation_MultiLevelCompound_v95_3.py
+                TestRotation_MultiLevelCompound_v95_4.py
+                TestSymmetry_MultiLevelCompound_v0_1.py
+                TestSymmetry_MultiLevelCompound_v0_2.py
+                TestSymmetry_MultiLevelCompound_v0_3.py
+                TestSymmetry_MultiLevelCompound_v0_4.py
+                TestSymmetry_MultiLevelCompound_v0_5.py
+                TestSymmetry_MultiLevelCompound_v95_1.py
+                TestSymmetry_MultiLevelCompound_v95_2.py
+                TestSymmetry_MultiLevelCompound_v95_3.py
+                TestSymmetry_MultiLevelCompound_v95_4.py
+                TestSymmetry_MultiLevelCompound_v95_5.py
+                TestScale_MultiLevelCompound_v0_1.py
+                TestScale_MultiLevelCompound_v0_2.py
+                TestScale_MultiLevelCompound_v0_3.py
+                TestScale_MultiLevelCompound_v0_4.py
+                TestScale_MultiLevelCompound_v95_1.py
+                TestScale_MultiLevelCompound_v95_2.py
+                TestScale_MultiLevelCompound_v95_3.py
+                TestScale_MultiLevelCompound_v95_4.py
+                TestMultiTranslation_MultiLevelCompound_v0_1.py
+                TestMultiTranslation_MultiLevelCompound_v0_2.py
+                TestMultiTranslation_MultiLevelCompound_v0_3.py
+                TestMultiTranslation_MultiLevelCompound_v0_4.py
+                TestMultiTranslation_MultiLevelCompound_v95_1.py
+                TestMultiTranslation_MultiLevelCompound_v95_2.py
+                TestMultiTranslation_MultiLevelCompound_v95_3.py
+                TestMultiTranslation_MultiLevelCompound_v95_4.py
+                TestMultiRotation_MultiLevelCompound_v0_1.py
+                TestMultiRotation_MultiLevelCompound_v0_2.py
+                TestMultiRotation_MultiLevelCompound_v0_3.py
+                TestMultiRotation_MultiLevelCompound_v0_4.py
+                TestMultiRotation_MultiLevelCompound_v95_1.py
+                TestMultiRotation_MultiLevelCompound_v95_2.py
+                TestMultiRotation_MultiLevelCompound_v95_3.py
+                TestMultiRotation_MultiLevelCompound_v95_4.py
+                TestIntersection_MultiLevelCompound_v0_1.py
+                TestIntersection_MultiLevelCompound_v0_2.py
+                TestIntersection_MultiLevelCompound_v95_1.py
+                TestIntersection_MultiLevelCompound_v95_2.py
+                TestFillet_MultiLevelCompound_v0_1.py
+                TestFillet_MultiLevelCompound_v0_2.py
+                TestFillet_MultiLevelCompound_v0_3.py
+                TestFillet_MultiLevelCompound_v0_4.py
+                TestFillet_MultiLevelCompound_v95_1.py
+                TestFillet_MultiLevelCompound_v95_2.py
+                TestFillet_MultiLevelCompound_v95_3.py
+                TestFillet_MultiLevelCompound_v95_4.py
+                TestChamfer_MultiLevelCompound_v0_1.py
+                TestChamfer_MultiLevelCompound_v0_2.py
+                TestChamfer_MultiLevelCompound_v0_3.py
+                TestChamfer_MultiLevelCompound_v0_4.py
+                TestChamfer_MultiLevelCompound_v95_1.py
+                TestChamfer_MultiLevelCompound_v95_2.py
+                TestChamfer_MultiLevelCompound_v95_3.py
+                TestChamfer_MultiLevelCompound_v95_4.py
  )
Simple merge
Simple merge
Simple merge