Commit: 7571222a690372bc907cf42c5fd9faa7f78abc74 Author: Campbell Barton Date: Thu Dec 15 17:24:23 2022 +1100 Branches: master https://developer.blender.org/rB7571222a690372bc907cf42c5fd9faa7f78abc74
Cleanup: add trailing commas for multi-line collections Avoid accidentally missing commas between strings, see: T101020. Also use single quotes for enum identifiers. =================================================================== M intern/cycles/blender/addon/presets.py M release/scripts/modules/bpy_extras/anim_utils.py M release/scripts/modules/bpy_extras/io_utils.py M release/scripts/startup/bl_operators/clip.py M release/scripts/startup/bl_operators/object.py M release/scripts/startup/bl_operators/object_quick_effects.py M release/scripts/startup/bl_operators/presets.py M release/scripts/startup/bl_operators/screen_play_rendered_anim.py M release/scripts/startup/bl_operators/userpref.py M release/scripts/startup/bl_operators/view3d.py M release/scripts/startup/bl_operators/wm.py M release/scripts/startup/bl_ui/properties_grease_pencil_common.py M release/scripts/startup/bl_ui/properties_output.py M release/scripts/startup/bl_ui/properties_paint_common.py M release/scripts/startup/bl_ui/properties_physics_cloth.py M release/scripts/startup/bl_ui/properties_physics_common.py M release/scripts/startup/bl_ui/space_clip.py M release/scripts/startup/bl_ui/space_filebrowser.py M release/scripts/startup/bl_ui/space_image.py M release/scripts/startup/bl_ui/space_node.py M release/scripts/startup/bl_ui/space_sequencer.py M release/scripts/startup/bl_ui/space_text.py M release/scripts/startup/bl_ui/space_toolsystem_common.py M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py M release/scripts/startup/bl_ui/space_userpref.py M release/scripts/startup/bl_ui/space_view3d.py M release/scripts/startup/nodeitems_builtins.py M tests/python/bl_pyapi_idprop.py =================================================================== diff --git a/intern/cycles/blender/addon/presets.py b/intern/cycles/blender/addon/presets.py index 6ad22d765aa..643f54a2bc3 100644 --- a/intern/cycles/blender/addon/presets.py +++ b/intern/cycles/blender/addon/presets.py @@ -92,7 +92,7 @@ class AddPresetPerformance(AddPresetBase, Operator): preset_defines = [ "render = bpy.context.scene.render", - "cycles = bpy.context.scene.cycles" + "cycles = bpy.context.scene.cycles", ] preset_values = [ diff --git a/release/scripts/modules/bpy_extras/anim_utils.py b/release/scripts/modules/bpy_extras/anim_utils.py index 3586401dd7a..3b90b18359e 100644 --- a/release/scripts/modules/bpy_extras/anim_utils.py +++ b/release/scripts/modules/bpy_extras/anim_utils.py @@ -159,7 +159,7 @@ def bake_action_iter( "bbone_curveinz", "bbone_curveoutz", "bbone_rollin", "bbone_rollout", "bbone_scalein", "bbone_scaleout", - "bbone_easein", "bbone_easeout" + "bbone_easein", "bbone_easeout", ] BBONE_PROPS_LENGTHS = { "bbone_curveinx": 1, diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py index 4dbe0d6f05b..04b536fce40 100644 --- a/release/scripts/modules/bpy_extras/io_utils.py +++ b/release/scripts/modules/bpy_extras/io_utils.py @@ -12,7 +12,7 @@ __all__ = ( "path_reference", "path_reference_copy", "path_reference_mode", - "unique_name" + "unique_name", ) import bpy diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index 73c0b4cfd8f..4e018ffc457 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -1028,7 +1028,7 @@ class CLIP_OT_track_settings_to_track(Operator): "use_red_channel", "use_green_channel", "use_blue_channel", - "weight" + "weight", ) _attrs_marker = ( diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index e3685b6ad78..6a130edbb38 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -776,7 +776,7 @@ class TransformsToDeltasAnim(Operator): "rotation_euler": "delta_rotation_euler", "rotation_quaternion": "delta_rotation_quaternion", # "rotation_axis_angle" : "delta_rotation_axis_angle", - "scale": "delta_scale" + "scale": "delta_scale", } DELTA_PATHS = STANDARD_TO_DELTA_PATHS.values() diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py index e48bd2c8987..d8b0e85be0e 100644 --- a/release/scripts/startup/bl_operators/object_quick_effects.py +++ b/release/scripts/startup/bl_operators/object_quick_effects.py @@ -46,7 +46,7 @@ class QuickFur(ObjectModeOperator, Operator): items=( ('LIGHT', "Light", ""), ('MEDIUM', "Medium", ""), - ('HEAVY', "Heavy", "") + ('HEAVY', "Heavy", ""), ), default='MEDIUM', ) diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 203eb128f0f..e4b9021926e 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -20,7 +20,7 @@ from bpy.app.translations import ( WindowManager.preset_name = StringProperty( name="Preset Name", description="Name for new preset", - default=data_("New Preset") + default=data_("New Preset"), ) @@ -309,7 +309,7 @@ class AddPresetCamera(AddPresetBase, Operator): preset_values = [ "cam.sensor_width", "cam.sensor_height", - "cam.sensor_fit" + "cam.sensor_fit", ] if self.use_focal_length: preset_values.append("cam.lens") @@ -439,7 +439,7 @@ class AddPresetTrackingCamera(AddPresetBase, Operator): "camera.pixel_aspect", "camera.k1", "camera.k2", - "camera.k3" + "camera.k3", ] if self.use_focal_length: preset_values.append("camera.units") @@ -459,7 +459,7 @@ class AddPresetTrackingTrackColor(AddPresetBase, Operator): preset_values = [ "track.color", - "track.use_custom_color" + "track.use_custom_color", ] preset_subdir = "tracking_track_color" @@ -489,7 +489,7 @@ class AddPresetTrackingSettings(AddPresetBase, Operator): "settings.use_default_red_channel", "settings.use_default_green_channel", "settings.use_default_blue_channel", - "settings.default_weight" + "settings.default_weight", ] preset_subdir = "tracking_settings" @@ -507,7 +507,7 @@ class AddPresetNodeColor(AddPresetBase, Operator): preset_values = [ "node.color", - "node.use_custom_color" + "node.use_custom_color", ] preset_subdir = "node_color" @@ -616,7 +616,7 @@ class AddPresetGpencilBrush(AddPresetBase, Operator): preset_defines = [ "brush = bpy.context.tool_settings.gpencil_paint.brush", - "settings = brush.gpencil_settings" + "settings = brush.gpencil_settings", ] preset_values = [ @@ -650,7 +650,7 @@ class AddPresetGpencilMaterial(AddPresetBase, Operator): preset_defines = [ "material = bpy.context.object.active_material", - "gpcolor = material.grease_pencil" + "gpcolor = material.grease_pencil", ] preset_values = [ diff --git a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py index 85bf38b08a8..11885da487e 100644 --- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py +++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py @@ -133,7 +133,7 @@ class PlayRenderedAnim(Operator): "-speed", str(fps_final), "-in_out", str(frame_start), str(frame_end), "-frame", str(scene.frame_current), - "-time_units", "Frames" + "-time_units", "Frames", ] cmd.extend(opts) elif preset == 'FRAMECYCLER': diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py index f1816b05aba..dc8504c057e 100644 --- a/release/scripts/startup/bl_operators/userpref.py +++ b/release/scripts/startup/bl_operators/userpref.py @@ -3,7 +3,7 @@ import bpy from bpy.types import ( Operator, - OperatorFileListElement + OperatorFileListElement, ) from bpy.props import ( BoolProperty, @@ -981,7 +981,7 @@ class PREFERENCES_OT_studiolight_install(Operator): ('MATCAP', "MatCap", "Install custom MatCaps"), ('WORLD', "World", "Install custom HDRIs"), ('STUDIO', "Studio", "Install custom Studio Lights"), - ) + ), ) def execute(self, context): diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py index 59e668d81ea..bb0d163fdd6 100644 --- a/release/scripts/startup/bl_operators/view3d.py +++ b/release/scripts/startup/bl_operators/view3d.py @@ -32,7 +32,7 @@ class VIEW3D_OT_edit_mesh_extrude_individual_move(Operator): TRANSFORM_OT_translate={ "orient_type": 'NORMAL', "constraint_axis": (False, False, True), - } + }, ) elif select_mode[2] and totface > 1: bpy.ops.mesh.extrude_faces_move('INVOKE_REGION_WIN') @@ -57,7 +57,7 @@ class VIEW3D_OT_edit_mesh_extrude_move(Operator): dissolve_and_intersect: BoolProperty( name="dissolve_and_intersect", default=False, - description="Dissolves adjacent faces and intersects new geometry" + description="Dissolves adjacent faces and intersects new geometry", ) @classmethod diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index abe304d84eb..bdb679eba07 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1377,7 +1377,8 @@ class WM_OT_properties_edit(Operator): name="Array Length", default=3, min=1, - max=32, # 32 is the maximum size for RNA array properties. + # 32 is the maximum size for RNA array properties. + max=32, ) # Integer properties. @@ -1458,7 +1459,7 @@ class WM_OT_properties_edit(Operator): # Store the value converted to a string as a fallback for otherwise unsupported types. eval_string: StringProperty( name="Value", - description="Python value for unsupported custom property types" + description="Python value for unsupported custom property types", ) type_items = rna_custom_property_type_items @@ -1904,7 +1905,7 @@ class WM_OT_properties_edit_value(Operator): # Store the value converted to a string as a fallback for otherwise unsupported types. eval_string: StringProperty( name="Value", - description="Value for custom property types that can only be edited as a Python expression" + description="Value for custom property types that can only be edited as a Python expression", ) def execute(self, context): @@ -2470,11 +2471,11 @@ class BatchRenameAction(bpy.types.PropertyGroup): replace_match_case: BoolProperty(name="Case Sensitive") use_replace_regex_src: BoolProperty( name="Regular Expression Find", - description="Use regular expressions to match text in the 'Find' field" + description="Use regular expressions to match text in the 'Find' field", ) use_replace_regex_dst: BoolProperty( name="Regular Expression Replace", - description="Use regular expression for the replacement text (supporting groups)" + description="Use regular expression for the replacement text (supporting gr @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs