[Bf-blender-cvs] [3c0a407511b] soc-2020-testing-frameworks: Solved merge conflicts in bevel operator caused due to change
calra123
noreply at git.blender.org
Sat Aug 8 13:57:02 CEST 2020
Commit: 3c0a407511b4cfe72324d117c571d5b75b41da1c
Author: calra123
Date: Wed Jul 29 17:21:42 2020 +0530
Branches: soc-2020-testing-frameworks
https://developer.blender.org/rB3c0a407511b4cfe72324d117c571d5b75b41da1c
Solved merge conflicts in bevel operator caused due to change
===================================================================
===================================================================
diff --cc tests/python/bevel_operator.py
index f9301703439,50f52b958f7..b45137c3f18
--- a/tests/python/bevel_operator.py
+++ b/tests/python/bevel_operator.py
@@@ -33,134 -33,135 +33,135 @@@ from modules.mesh_test import OperatorT
def main():
tests = [
# 0
- ['EDGE', {10}, 'Cube_test', 'Cube_result_1', 'bevel', {'offset': 0.2}],
- ['EDGE', {10, 7}, 'Cube_test', 'Cube_result_2', 'bevel', {'offset': 0.2, 'offset_type': 'WIDTH'}],
- ['EDGE', {8, 10, 7}, 'Cube_test', 'Cube_result_3', 'bevel', {'offset': 0.2, 'offset_type': 'DEPTH'}],
- ['EDGE', {10}, 'Cube_test', 'Cube_result_4', 'bevel', {'offset': 0.4, 'segments': 2}],
- ['EDGE', {10, 7}, 'Cube_test', 'Cube_result_5', 'bevel', {'offset': 0.4, 'segments': 3}],
+ ['EDGE', {10}, "test 1", 'Cube_test', 'Cube_result_1', 'bevel', {'offset': 0.2}],
+ ['EDGE', {10, 7}, "test 2", 'Cube_test', 'Cube_result_2', 'bevel', {'offset': 0.2, 'offset_type': 'WIDTH'}],
+ ['EDGE', {8, 10, 7}, "test 3", 'Cube_test', 'Cube_result_3', 'bevel', {'offset': 0.2, 'offset_type': 'DEPTH'}],
+ ['EDGE', {10}, "test 4", 'Cube_test', 'Cube_result_4', 'bevel', {'offset': 0.4, 'segments': 2}],
+ ['EDGE', {10, 7}, "test 5", 'Cube_test', 'Cube_result_5', 'bevel', {'offset': 0.4, 'segments': 3}],
# 5
- ['EDGE', {8, 10, 7}, 'Cube_test', 'Cube_result_6', 'bevel', {'offset': 0.4, 'segments': 4}],
- ['EDGE', {0, 10, 4, 7}, 'Cube_test', 'Cube_result_7', 'bevel', {'offset': 0.4, 'segments': 5, 'profile': 0.2}],
- ['EDGE', {8, 10, 7}, 'Cube_test', 'Cube_result_8', 'bevel', {'offset': 0.4, 'segments': 5, 'profile': 0.25}],
- ['EDGE', {8, 10, 7}, 'Cube_test', 'Cube_result_9', 'bevel', {'offset': 0.4, 'segments': 6, 'profile': 0.9}],
- ['EDGE', {10, 7}, 'Cube_test', 'Cube_result_10', 'bevel', {'offset': 0.4, 'segments': 4, 'profile': 1.0}],
+ ['EDGE', {8, 10, 7}, "test 6", 'Cube_test', 'Cube_result_6', 'bevel', {'offset': 0.4, 'segments': 4}],
+ ['EDGE', {0, 10, 4, 7}, "test 7", 'Cube_test', 'Cube_result_7', 'bevel', {'offset': 0.4, 'segments': 5, 'profile': 0.2}],
+ ['EDGE', {8, 10, 7}, "test 8", 'Cube_test', 'Cube_result_8', 'bevel', {'offset': 0.4, 'segments': 5, 'profile': 0.25}],
+ ['EDGE', {8, 10, 7}, "test 9", 'Cube_test', 'Cube_result_9', 'bevel', {'offset': 0.4, 'segments': 6, 'profile': 0.9}],
+ ['EDGE', {10, 7}, "test 10", 'Cube_test', 'Cube_result_10', 'bevel', {'offset': 0.4, 'segments': 4, 'profile': 1.0}],
# 10
- ['EDGE', {8, 10, 7}, 'Cube_test', 'Cube_result_11', 'bevel', {'offset': 0.4, 'segments': 5, 'profile': 1.0}],
- ['EDGE', {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 'Cube_test', 'Cube_result_12', 'bevel',
+ ['EDGE', {8, 10, 7}, "test 11", 'Cube_test', 'Cube_result_11', 'bevel', {'offset': 0.4, 'segments': 5, 'profile': 1.0}],
+ ['EDGE', {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, "test 12", 'Cube_test', 'Cube_result_12', 'bevel',
{'offset': 0.4, 'segments': 8}],
- ['EDGE', {5}, 'Pyr4_test', 'Pyr4_result_1', 'bevel', {'offset': 0.2}],
- ['EDGE', {2, 5}, 'Pyr4_test', 'Pyr4_result_2', 'bevel', {'offset': 0.2}],
- ['EDGE', {2, 3, 5}, 'Pyr4_test', 'Pyr4_result_3', 'bevel', {'offset': 0.2}],
+ ['EDGE', {5}, "test 13", 'Pyr4_test', 'Pyr4_result_1', 'bevel', {'offset': 0.2}],
+ ['EDGE', {2, 5}, "test 14", 'Pyr4_test', 'Pyr4_result_2', 'bevel', {'offset': 0.2}],
+ ['EDGE', {2, 3, 5}, "test 15", 'Pyr4_test', 'Pyr4_result_3', 'bevel', {'offset': 0.2}],
# 15
- ['EDGE', {1, 2, 3, 5}, 'Pyr4_test', 'Pyr4_result_4', 'bevel', {'offset': 0.2}],
- ['EDGE', {1, 2, 3, 5}, 'Pyr4_test', 'Pyr4_result_5', 'bevel', {'offset': 0.2, 'segments': 3}],
- ['EDGE', {2, 3}, 'Pyr4_test', 'Pyr4_result_6', 'bevel', {'offset': 0.2, 'segments': 2}],
- ['EDGE', {1, 2, 3, 5}, 'Pyr4_test', 'Pyr4_result_7', 'bevel', {'offset': 0.2, 'segments': 4, 'profile': 0.15}],
- ['VERT', {1}, 'Pyr4_test', 'Pyr4_result_8', 'bevel', {'offset': 0.75, 'segments': 4, 'affect': 'VERTICES'}],
+ ['EDGE', {1, 2, 3, 5}, "test 16", 'Pyr4_test', 'Pyr4_result_4', 'bevel', {'offset': 0.2}],
+ ['EDGE', {1, 2, 3, 5}, "test 17", 'Pyr4_test', 'Pyr4_result_5', 'bevel', {'offset': 0.2, 'segments': 3}],
+ ['EDGE', {2, 3}, "test 18", 'Pyr4_test', 'Pyr4_result_6', 'bevel', {'offset': 0.2, 'segments': 2}],
+ ['EDGE', {1, 2, 3, 5}, "test 19", 'Pyr4_test', 'Pyr4_result_7', 'bevel', {'offset': 0.2, 'segments': 4, 'profile': 0.15}],
- ['VERT', {1}, "test 20", 'Pyr4_test', 'Pyr4_result_8', 'bevel', {'offset': 0.75, 'segments': 4, 'vertex_only': True}],
++ ['VERT', {1}, "test 20", 'Pyr4_test', 'Pyr4_result_8', 'bevel', {'offset': 0.75, 'segments': 4, 'affect': 'VERTICES'}],
# 20
- ['VERT', {1}, 'Pyr4_test', 'Pyr4_result_9', 'bevel',
+ ['VERT', {1}, "test 21", 'Pyr4_test', 'Pyr4_result_9', 'bevel',
- {'offset': 0.75, 'segments': 3, 'vertex_only': True, 'profile': 0.25}],
+ {'offset': 0.75, 'segments': 3, 'affect': 'VERTICES', 'profile': 0.25}],
- ['EDGE', {2, 3}, 'Pyr6_test', 'Pyr6_result_1', 'bevel', {'offset': 0.2}],
- ['EDGE', {8, 2, 3}, 'Pyr6_test', 'Pyr6_result_2', 'bevel', {'offset': 0.2, 'segments': 2}],
- ['EDGE', {0, 2, 3, 4, 6, 7, 9, 10, 11}, 'Pyr6_test', 'Pyr6_result_3', 'bevel',
+ ['EDGE', {2, 3}, "test 22", 'Pyr6_test', 'Pyr6_result_1', 'bevel', {'offset': 0.2}],
+ ['EDGE', {8, 2, 3}, "test 23", 'Pyr6_test', 'Pyr6_result_2', 'bevel', {'offset': 0.2, 'segments': 2}],
+ ['EDGE', {0, 2, 3, 4, 6, 7, 9, 10, 11}, "test 24", 'Pyr6_test', 'Pyr6_result_3', 'bevel',
{'offset': 0.2, 'segments': 4, 'profile': 0.8}],
- ['EDGE', {8, 9, 3, 11}, 'Sept_test', 'Sept_result_1', 'bevel', {'offset': 0.1}],
+ ['EDGE', {8, 9, 3, 11}, "test 25", 'Sept_test', 'Sept_result_1', 'bevel', {'offset': 0.1}],
# 25
- ['EDGE', {8, 9, 11}, 'Sept_test', 'Sept_result_2', 'bevel', {'offset': 0.1, 'offset_type': 'WIDTH'}],
- ['EDGE', {2, 8, 9, 12, 13, 14}, 'Saddle_test', 'Saddle_result_1', 'bevel', {'offset': 0.3, 'segments': 5}],
- ['VERT', {4}, 'Saddle_test', 'Saddle_result_2', 'bevel', {'offset': 0.6, 'segments': 6, 'affect': 'VERTICES'}],
- ['EDGE', {2, 5, 8, 11, 14, 18, 21, 24, 27, 30, 34, 37, 40, 43, 46, 50, 53, 56, 59, 62, 112, 113, 114, 115},
+ ['EDGE', {8, 9, 11}, "test 26", 'Sept_test', 'Sept_result_2', 'bevel', {'offset': 0.1, 'offset_type': 'WIDTH'}],
+ ['EDGE', {2, 8, 9, 12, 13, 14}, "test 27", 'Saddle_test', 'Saddle_result_1', 'bevel', {'offset': 0.3, 'segments': 5}],
- ['VERT', {4}, "test 28", 'Saddle_test', 'Saddle_result_2', 'bevel', {'offset': 0.6, 'segments': 6, 'vertex_only': True}],
++ ['VERT', {4}, "test 28", 'Saddle_test', 'Saddle_result_2', 'bevel', {'offset': 0.6, 'segments': 6, 'affect': 'VERTICES'}],
+ ['EDGE', {2, 5, 8, 11, 14, 18, 21, 24, 27, 30, 34, 37, 40, 43, 46, 50, 53, 56, 59, 62, 112, 113, 114, 115}, "test 29",
++
'Bent_test', 'Bent_result_1', 'bevel', {'offset': 0.2, 'segments': 3}],
- ['EDGE', {1, 8, 9, 10, 11}, 'Bentlines_test', 'Bentlines_result_1', 'bevel', {'offset': 0.2, 'segments': 3}],
+ ['EDGE', {1, 8, 9, 10, 11}, "test 31", 'Bentlines_test', 'Bentlines_result_1', 'bevel', {'offset': 0.2, 'segments': 3}],
# 30
- ['EDGE', {26, 12, 20}, 'Flaretop_test', 'Flaretop_result_1', 'bevel', {'offset': 0.4, 'segments': 2}],
- ['EDGE', {26, 12, 20}, 'Flaretop_test', 'Flaretop_result_2', 'bevel',
+ ['EDGE', {26, 12, 20}, "test 32", 'Flaretop_test', 'Flaretop_result_1', 'bevel', {'offset': 0.4, 'segments': 2}],
+ ['EDGE', {26, 12, 20}, "test 33", 'Flaretop_test', 'Flaretop_result_2', 'bevel',
{'offset': 0.4, 'segments': 2, 'profile': 1.0}],
- ['FACE', {1, 6, 7, 8, 9, 10, 11, 12}, 'Flaretop_test', 'Flaretop_result_3', 'bevel',
+ ['FACE', {1, 6, 7, 8, 9, 10, 11, 12}, "test 34", 'Flaretop_test', 'Flaretop_result_3', 'bevel',
{'offset': 0.4, 'segments': 4}],
- ['EDGE', {4, 8, 10, 18, 24}, 'BentL_test', 'BentL_result_1', 'bevel', {'offset': 0.2}],
- ['EDGE', {0, 1, 2, 10}, 'Wires_test', 'Wires_test_result_1', 'bevel', {'offset': 0.3}],
+ ['EDGE', {4, 8, 10, 18, 24}, "test 35", 'BentL_test', 'BentL_result_1', 'bevel', {'offset': 0.2}],
+ ['EDGE', {0, 1, 2, 10}, "test 36", 'Wires_test', 'Wires_test_result_1', 'bevel', {'offset': 0.3}],
# 35
- ['VERT', {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, 'Wires_test', 'Wires_test_result_2', 'bevel',
+ ['VERT', {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}, "test 37", 'Wires_test', 'Wires_test_result_2', 'bevel',
- {'offset': 0.3, 'vertex_only': True}],
+ {'offset': 0.3, 'affect': 'VERTICES'}],
- ['EDGE', {3, 4, 5}, 'tri', 'tri_result_1', 'bevel', {'offset': 0.2}],
- ['EDGE', {3, 4, 5}, 'tri', 'tri_result_2', 'bevel', {'offset': 0.2, 'segments': 2}],
- ['EDGE', {3, 4, 5}, 'tri', 'tri_result_3', 'bevel', {'offset': 0.2, 'segments': 3}],
- ['EDGE', {3, 4}, 'tri', 'tri_result_4', 'bevel', {'offset': 0.2}],
+ ['EDGE', {3, 4, 5}, "test 38", 'tri', 'tri_result_1', 'bevel', {'offset': 0.2}],
+ ['EDGE', {3, 4, 5}, "test 39", 'tri', 'tri_result_2', 'bevel', {'offset': 0.2, 'segments': 2}],
+ ['EDGE', {3, 4, 5}, "test 40", 'tri', 'tri_result_3', 'bevel', {'offset': 0.2, 'segments': 3}],
+ ['EDGE', {3, 4}, "test 41", 'tri', 'tri_result_4', 'bevel', {'offset': 0.2}],
# 40
- ['EDGE', {3, 4}, 'tri', 'tri_result_5', 'bevel', {'offset': 0.2, 'segments': 2}],
- ['VERT', {3}, 'tri', 'tri_result_6', 'bevel', {'offset': 0.2, 'affect': 'VERTICES'}],
- ['VERT', {3}, 'tri', 'tri_result_7', 'bevel', {'offset': 0.2, 'segments': 2, 'affect': 'VERTICES'}],
- ['VERT', {3}, 'tri', 'tri_result_8', 'bevel', {'offset': 0.2, 'segments': 3, 'affect': 'VERTICES'}],
- ['VERT', {1}, 'tri', 'tri_result_9', 'bevel', {'offset': 0.2, 'a
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list