[Bf-blender-cvs] [191ab5990b8] soc-2020-testing-frameworks: Resolved a merge conflict related to the threshold of Weld modifier
Himanshi Kalra
noreply at git.blender.org
Tue Dec 15 18:07:54 CET 2020
Commit: 191ab5990b87373819165e84a105fd4d6695b671
Author: Himanshi Kalra
Date: Sun Sep 27 16:32:24 2020 +0530
Branches: soc-2020-testing-frameworks
https://developer.blender.org/rB191ab5990b87373819165e84a105fd4d6695b671
Resolved a merge conflict related to the threshold of Weld modifier
===================================================================
===================================================================
diff --cc tests/python/modifiers.py
index 7d76ff47a46,ba156cef8ea..09d12cc5e47
--- a/tests/python/modifiers.py
+++ b/tests/python/modifiers.py
@@@ -148,90 -134,62 +148,92 @@@ def main()
# One 'Generate' modifier on primitive meshes
#############################################
# 12
- ["testCubeArray", "expectedCubeArray", [ModifierSpec('array', 'ARRAY', {})]],
- ["testCapArray", "expectedCapArray",
- [ModifierSpec('array', 'ARRAY', {'fit_type': 'FIT_LENGTH', 'fit_length': 2.0, 'start_cap': bpy.data.objects["testCapStart"], 'end_cap': bpy.data.objects["testCapEnd"]})]],
- ["testCurveArray", "expectedCurveArray",
- [ModifierSpec('array', 'ARRAY', {'fit_type': 'FIT_CURVE', 'curve': bpy.data.objects["testCurveArrayHelper"], 'use_relative_offset': False, 'use_constant_offset': True, 'constant_offset_displace': (0.5, 0, 0)})]],
- ["testRadialArray", "expectedRadialArray",
- [ModifierSpec('array', 'ARRAY', {'fit_type': 'FIXED_COUNT', 'count': 3, 'use_merge_vertices': True, 'use_merge_vertices_cap': True, 'use_relative_offset': False, 'use_object_offset': True, 'offset_object': bpy.data.objects["testRadialArrayHelper"]})]],
-
- ["testCylinderBuild", "expectedCylinderBuild", [ModifierSpec('build', 'BUILD', {'frame_start': 0, 'frame_duration': 1})]],
+ MeshTest("CubeArray", "testCubeArray", "expectedCubeArray",
+ [ModifierSpec('array', 'ARRAY', {})]),
+ MeshTest("CapArray", "testCapArray", "expectedCapArray",
+ [ModifierSpec('array', 'ARRAY',
+ {'fit_type': 'FIT_LENGTH', 'fit_length': 2.0,
+ 'start_cap': bpy.data.objects["testCapStart"],
+ 'end_cap': bpy.data.objects["testCapEnd"]})]),
+ MeshTest("CurveArray", "testCurveArray", "expectedCurveArray",
+ [ModifierSpec('array', 'ARRAY',
+ {'fit_type': 'FIT_CURVE', 'curve': bpy.data.objects["testCurveArrayHelper"],
+ 'use_relative_offset': False, 'use_constant_offset': True,
+ 'constant_offset_displace': (0.5, 0, 0)})]),
+ MeshTest("RadialArray", "testRadialArray", "expectedRadialArray",
+ [ModifierSpec('array', 'ARRAY', {'fit_type': 'FIXED_COUNT', 'count': 3, 'use_merge_vertices': True,
+ 'use_merge_vertices_cap': True, 'use_relative_offset': False,
+ 'use_object_offset': True,
+ 'offset_object': bpy.data.objects["testRadialArrayHelper"]})]),
+
+ MeshTest("CylinderBuild", "testCylinderBuild", "expectedCylinderBuild",
+ [ModifierSpec('build', 'BUILD', {'frame_start': 0, 'frame_duration': 1})]),
# 17
- ["testConeDecimate", "expectedConeDecimate", [ModifierSpec('decimate', 'DECIMATE', {'ratio': 0.5})]],
- ["testCubeEdgeSplit", "expectedCubeEdgeSplit", [ModifierSpec('edge split', 'EDGE_SPLIT', {})]],
-
- ["testSphereMirror", "expectedSphereMirror", [ModifierSpec('mirror', 'MIRROR', {})]],
- ["testLocalMirror", "expectedLocalMirror",
- [ModifierSpec('mirror', 'MIRROR', {'use_clip': True})]],
- ["testObjectOffsetMirror", "expectedObjectOffsetMirror",
- [ModifierSpec('mirror', 'MIRROR', {'mirror_object': bpy.data.objects["testObjectOffsetMirrorHelper"]})]],
-
- ["testCylinderMask", "expectedCylinderMask", [ModifierSpec('mask', 'MASK', {'vertex_group': "mask_vertex_group"})]],
- ["testConeMultiRes", "expectedConeMultiRes", [ModifierSpec('multires', 'MULTIRES', {})]],
+ MeshTest("ConeDecimate", "testConeDecimate", "expectedConeDecimate",
+ [ModifierSpec('decimate', 'DECIMATE', {'ratio': 0.5})]),
+ MeshTest("CubeEdgeSplit", "testCubeEdgeSplit", "expectedCubeEdgeSplit",
+ [ModifierSpec('edge split', 'EDGE_SPLIT', {})]),
+
+ MeshTest("SphereMirror", "testSphereMirror", "expectedSphereMirror",
+ [ModifierSpec('mirror', 'MIRROR', {})]),
+ MeshTest("LocalMirror", "testLocalMirror", "expectedLocalMirror",
+ [ModifierSpec('mirror', 'MIRROR', {'use_clip': True})]),
+ MeshTest("ObjectOffsetMirror", "testObjectOffsetMirror", "expectedObjectOffsetMirror",
+ [ModifierSpec('mirror', 'MIRROR',
+ {'mirror_object': bpy.data.objects["testObjectOffsetMirrorHelper"]})]),
+
+ MeshTest("CylinderMask", "testCylinderMask", "expectedCylinderMask",
+ [ModifierSpec('mask', 'MASK', {'vertex_group': "mask_vertex_group"})]),
+ MeshTest("ConeMultiRes", "testConeMultiRes", "expectedConeMultiRes",
+ [ModifierSpec('multires', 'MULTIRES', {})]),
# 24
- ["testCubeScrew", "expectedCubeScrew", [ModifierSpec('screw', 'SCREW', {})]],
-
- ["testCubeSolidify", "expectedCubeSolidify", [ModifierSpec('solidify', 'SOLIDIFY', {})]],
- ["testComplexSolidify", "expectedComplexSolidify",
- [ModifierSpec('solidify', 'SOLIDIFY', {'solidify_mode': 'NON_MANIFOLD', 'thickness': 0.05, 'offset': 0, 'nonmanifold_thickness_mode': 'CONSTRAINTS'})]],
- ["regressT63063Solidify", "expectedT63063Solidify",
- [ModifierSpec('solid', 'SOLIDIFY', {'thickness': 0.1, 'offset': 0.7})]],
- ["regressT61979Solidify", "expectedT61979Solidify",
- [ModifierSpec('solid', 'SOLIDIFY', {'thickness': -0.25, 'use_even_offset': True, 'use_quality_normals': True})]],
-
- ["testMonkeySubsurf", "expectedMonkeySubsurf", [ModifierSpec('subsurf', 'SUBSURF', {})]],
- ["testCatmullClarkSubdivisionSurface", "expectedCatmullClarkSubdivisionSurface",
- [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2})]],
- ["testSimpleSubdivisionSurface", "expectedSimpleSubdivisionSurface",
- [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2, 'subdivision_type': 'SIMPLE'})]],
- ["testCrease2dSubdivisionSurface", "expectedCrease2dSubdivisionSurface",
- [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2})]],
- ["testCrease3dSubdivisionSurface", "expectedCrease3dSubdivisionSurface",
- [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2})]],
+ MeshTest("CubeScrew", "testCubeScrew", "expectedCubeScrew",
+ [ModifierSpec('screw', 'SCREW', {})]),
+
+ MeshTest("CubeSolidify", "testCubeSolidify", "expectedCubeSolidify",
+ [ModifierSpec('solidify', 'SOLIDIFY', {})]),
+ MeshTest("ComplexSolidify", "testComplexSolidify", "expectedComplexSolidify",
+ [ModifierSpec('solidify', 'SOLIDIFY', {'solidify_mode': 'NON_MANIFOLD', 'thickness': 0.05, 'offset': 0,
+ 'nonmanifold_thickness_mode': 'CONSTRAINTS'})]),
+ MeshTest("T63063Solidify", "regressT63063Solidify", "expectedT63063Solidify",
+ [ModifierSpec('solid', 'SOLIDIFY', {'thickness': 0.1, 'offset': 0.7})]),
+ MeshTest("T61979Solidify", "regressT61979Solidify", "expectedT61979Solidify",
+ [ModifierSpec('solid', 'SOLIDIFY',
+ {'thickness': -0.25, 'use_even_offset': True, 'use_quality_normals': True})]),
+
+ MeshTest("MonkeySubsurf", "testMonkeySubsurf", "expectedMonkeySubsurf",
+ [ModifierSpec('subsurf', 'SUBSURF', {})]),
+ MeshTest("CatmullClarkSubdivisionSurface", "testCatmullClarkSubdivisionSurface",
+ "expectedCatmullClarkSubdivisionSurface",
+ [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2})]),
+ MeshTest("SimpleSubdivisionSurface", "testSimpleSubdivisionSurface", "expectedSimpleSubdivisionSurface",
+ [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2, 'subdivision_type': 'SIMPLE'})]),
+ MeshTest("Crease2dSubdivisionSurface", "testCrease2dSubdivisionSurface", "expectedCrease2dSubdivisionSurface",
+ [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2})]),
+ MeshTest("Crease3dSubdivisionSurface", "testCrease3dSubdivisionSurface", "expectedCrease3dSubdivisionSurface",
+ [ModifierSpec("subdivision", 'SUBSURF', {"levels": 2})]),
# 34
- ["testSphereTriangulate", "expectedSphereTriangulate", [ModifierSpec('triangulate', 'TRIANGULATE', {})]],
- ["testMonkeyWireframe", "expectedMonkeyWireframe", [ModifierSpec('wireframe', 'WIREFRAME', {})]],
- #ModifierSpec('skin', 'SKIN', {}), # skin is not reproducible .
+
- ["testMergedWeld", "expectedMergedWeld",
- [ModifierSpec("weld", 'WELD', {"merge_threshold": 0.021})]],
- ["testMergedAllWeld", "expectedMergedAllWeld",
- [ModifierSpec("weld", 'WELD', {"merge_threshold": 1.8})]],
- ["testMergedNoneWeld", "expectedMergedNoneWeld",
- [ModifierSpec("weld", 'WELD', {"merge_threshold": 0.019})]],
+ MeshTest("SphereTriangulate", "testSphereTriangulate", "expectedSphereTriangulate",
+ [ModifierSpec('triangulate', 'TRIANGULATE', {})]),
+ MeshTest("MonkeyWireframe", "testMonkeyWireframe", "expectedMonkeyWireframe",
+ [ModifierSpec('wireframe', 'WIREFRAME', {})]),
+
+ # Duplicate the object, test object and expected object have same world coordinates.
+ MeshTest("Skin", "testObjPlaneSkin", "expObjPlaneSkin",
+ [ModifierSpec('skin', 'SKIN', {})]),
+
+ MeshTest("MergedWeld", "testMergedWeld", "expectedMergedWeld",
+ [ModifierSpec("weld", 'WELD', {"merge_threshold": 0.021})]),
+ MeshTest("MergedAllWeld", "testMergedAllWeld", "expectedMergedAllWeld",
- [ModifierSpec("weld", 'WELD', {"merge_threshold": 1.1})]),
++ [ModifierSpec("weld", 'WELD', {"merge_threshold": 1.8})]),
+ MeshTest("MergedNoneWeld", "testMergedNoneWeld", "expectedMergedNoneWeld",
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list