[Bf-blender-cvs] [3649c05f579] master: Cleanup: Run `make format` on codebase.
Bastien Montagne
noreply at git.blender.org
Mon Jan 30 09:46:02 CET 2023
Commit: 3649c05f57936484939f62e935b1057160ce7c21
Author: Bastien Montagne
Date: Mon Jan 30 09:40:17 2023 +0100
Branches: master
https://developer.blender.org/rB3649c05f57936484939f62e935b1057160ce7c21
Cleanup: Run `make format` on codebase.
===================================================================
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M tests/python/bl_usd_import_test.py
===================================================================
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index 9f25d421c9d..e1b34e4cc55 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -6281,7 +6281,7 @@ def km_sculpt_expand_modal(_params):
("MOVE_TOGGLE", {"type": 'SPACE', "value": 'ANY', "any": True}, None),
*((e, {"type": NUMBERS_1[i], "value": 'PRESS', "any": True}, None) for i, e in enumerate(
("FALLOFF_GEODESICS", "FALLOFF_TOPOLOGY", "FALLOFF_TOPOLOGY_DIAGONALS", "FALLOFF_SPHERICAL"))),
- *((e, {"type": "NUMPAD_%i" % (i+1), "value": 'PRESS', "any": True}, None) for i, e in enumerate(
+ *((e, {"type": "NUMPAD_%i" % (i + 1), "value": 'PRESS', "any": True}, None) for i, e in enumerate(
("FALLOFF_GEODESICS", "FALLOFF_TOPOLOGY", "FALLOFF_TOPOLOGY_DIAGONALS", "FALLOFF_SPHERICAL"))),
("SNAP_TOGGLE", {"type": 'LEFT_CTRL', "value": 'ANY'}, None),
("SNAP_TOGGLE", {"type": 'RIGHT_CTRL', "value": 'ANY'}, None),
diff --git a/tests/python/bl_usd_import_test.py b/tests/python/bl_usd_import_test.py
index 8639cbd61a2..70c1ac1c127 100644
--- a/tests/python/bl_usd_import_test.py
+++ b/tests/python/bl_usd_import_test.py
@@ -111,11 +111,15 @@ class USDImportTest(AbstractUSDTest):
self.assertEqual(1, len(objects), f"File {infile} should contain one object, found {len(objects)}")
mesh = bpy.data.objects["uvmap_plane"].data
- self.assertEqual(len(mesh.uv_layers), 2, f"Object uvmap_plane should have two uv layers, found {len(mesh.uv_layers)}")
-
+ self.assertEqual(len(mesh.uv_layers), 2,
+ f"Object uvmap_plane should have two uv layers, found {len(mesh.uv_layers)}")
+
expected_layer_names = {"udim_map", "uvmap"}
imported_layer_names = set(mesh.uv_layers.keys())
- self.assertEqual(expected_layer_names, imported_layer_names, f"Expected layer names ({expected_layer_names}) not found on uvmap_plane.")
+ self.assertEqual(
+ expected_layer_names,
+ imported_layer_names,
+ f"Expected layer names ({expected_layer_names}) not found on uvmap_plane.")
def get_coords(data):
coords = [x.uv for x in uvmap]
@@ -123,13 +127,13 @@ class USDImportTest(AbstractUSDTest):
def uv_min_max(data):
coords = get_coords(data)
- uv_min_x = min([uv[0] for uv in coords])
- uv_max_x = max([uv[0] for uv in coords])
- uv_min_y = min([uv[1] for uv in coords])
- uv_max_y = max([uv[1] for uv in coords])
+ uv_min_x = min([uv[0] for uv in coords])
+ uv_max_x = max([uv[0] for uv in coords])
+ uv_min_y = min([uv[1] for uv in coords])
+ uv_max_y = max([uv[1] for uv in coords])
return uv_min_x, uv_max_x, uv_min_y, uv_max_y
- ## Quick tests for point range.
+ # Quick tests for point range.
uvmap = mesh.uv_layers["uvmap"].data
self.assertEqual(len(uvmap), 128)
min_x, max_x, min_y, max_y = uv_min_max(uvmap)
@@ -145,12 +149,13 @@ class USDImportTest(AbstractUSDTest):
self.assertGreaterEqual(min_y, 0.0)
self.assertLessEqual(max_x, 2.0)
self.assertLessEqual(max_y, 1.0)
-
- ## Make sure at least some points are in a udim tile.
+
+ # Make sure at least some points are in a udim tile.
coords = get_coords(uvmap)
coords = list(filter(lambda x: x[0] > 1.0, coords))
self.assertGreater(len(coords), 16)
+
def main():
global args
import argparse
More information about the Bf-blender-cvs
mailing list