[Bf-blender-cvs] [d2e474d043a] master: Cleanup: use trailing commas for multi-line arguments

Campbell Barton noreply at git.blender.org
Fri Jun 21 00:42:02 CEST 2019


Commit: d2e474d043abf8eca750abc1475fd99b08a77a45
Author: Campbell Barton
Date:   Fri Jun 21 08:36:03 2019 +1000
Branches: master
https://developer.blender.org/rBd2e474d043abf8eca750abc1475fd99b08a77a45

Cleanup: use trailing commas for multi-line arguments

===================================================================

M	release/scripts/startup/bl_operators/object.py
M	release/scripts/startup/bl_operators/presets.py
M	release/scripts/startup/bl_operators/uvcalc_lightmap.py
M	release/scripts/startup/bl_operators/uvcalc_smart_project.py
M	release/scripts/startup/bl_ui/properties_physics_common.py
M	release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
M	release/scripts/startup/bl_ui/space_image.py

===================================================================

diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 28324891c53..93a022e6c3e 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -126,7 +126,7 @@ class SelectCamera(Operator):
     extend: BoolProperty(
         name="Extend",
         description="Extend the selection",
-        default=False
+        default=False,
     )
 
     def execute(self, context):
@@ -887,7 +887,7 @@ class LoadImageAsEmpty:
 
     view_align: BoolProperty(
         name="Align to view",
-        default=True
+        default=True,
     )
 
     @classmethod
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index 451d7b5a427..097b93ea9ca 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -436,7 +436,7 @@ class AddPresetTrackingCamera(AddPresetBase, Operator):
         name="Include Focal Length",
         description="Include focal length into the preset",
         options={'SKIP_SAVE'},
-        default=True
+        default=True,
     )
 
     @property
diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
index b5cb5024ad0..2b20754a995 100644
--- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py
+++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py
@@ -233,15 +233,16 @@ class prettyface:
         return self.width, self.height
 
 
-def lightmap_uvpack(meshes,
-                    PREF_SEL_ONLY=True,
-                    PREF_NEW_UVLAYER=False,
-                    PREF_PACK_IN_ONE=False,
-                    PREF_APPLY_IMAGE=False,
-                    PREF_IMG_PX_SIZE=512,
-                    PREF_BOX_DIV=8,
-                    PREF_MARGIN_DIV=512
-                    ):
+def lightmap_uvpack(
+        meshes,
+        PREF_SEL_ONLY=True,
+        PREF_NEW_UVLAYER=False,
+        PREF_PACK_IN_ONE=False,
+        PREF_APPLY_IMAGE=False,
+        PREF_IMG_PX_SIZE=512,
+        PREF_BOX_DIV=8,
+        PREF_MARGIN_DIV=512,
+):
     """
     BOX_DIV if the maximum division of the UV map that
     a box may be consolidated into.
diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
index 321c4d76ef3..fdf74c420a9 100644
--- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py
+++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py
@@ -1011,7 +1011,7 @@ class SmartProject(Operator):
     use_aspect: BoolProperty(
         name="Correct Aspect",
         description="Map UVs taking image aspect ratio into account",
-        default=True
+        default=True,
     )
     stretch_to_bounds: BoolProperty(
         name="Stretch to UV Bounds",
@@ -1029,8 +1029,8 @@ class SmartProject(Operator):
              self.angle_limit,
              self.user_area_weight,
              self.use_aspect,
-             self.stretch_to_bounds
-             )
+             self.stretch_to_bounds,
+        )
         return {'FINISHED'}
 
     def invoke(self, context, _event):
diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py
index 946760c3bd0..9dbe11b0c70 100644
--- a/release/scripts/startup/bl_ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -135,7 +135,7 @@ def point_cache_ui(self, cache, enabled, cachetype):
         row = layout.row()
         row.template_list(
             "UI_UL_list", "point_caches", cache, "point_caches",
-            cache.point_caches, "active_index", rows=1
+            cache.point_caches, "active_index", rows=1,
         )
         col = row.column(align=True)
         col.operator("ptcache.add", icon='ADD', text="")
diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
index 2b8e488cbe9..7e4f9e8370f 100644
--- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
@@ -150,7 +150,7 @@ class PHYSICS_PT_dynamic_paint_settings(PhysicButtonsPanel, Panel):
             row = layout.row()
             row.template_list(
                 "PHYSICS_UL_dynapaint_surfaces", "", canvas, "canvas_surfaces",
-                canvas.canvas_surfaces, "active_index", rows=1
+                canvas.canvas_surfaces, "active_index", rows=1,
             )
 
             col = row.column(align=True)
@@ -163,7 +163,7 @@ class PHYSICS_PT_dynamic_paint_settings(PhysicButtonsPanel, Panel):
 
             if surface:
                 flow = layout.grid_flow(
-                    row_major=True, columns=0, even_columns=True, even_rows=False, align=False
+                    row_major=True, columns=0, even_columns=True, even_rows=False, align=False,
                 )
                 col = flow.column()
 
@@ -191,7 +191,7 @@ class PHYSICS_PT_dynamic_paint_settings(PhysicButtonsPanel, Panel):
             layout.use_property_split = True
 
             flow = layout.grid_flow(
-                row_major=True, columns=0, even_columns=True, even_rows=False, align=False
+                row_major=True, columns=0, even_columns=True, even_rows=False, align=False,
             )
             col = flow.column()
             col.prop(brush, "paint_color")
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 1a0bc03dd38..2aba440bf1d 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -952,7 +952,7 @@ class IMAGE_PT_render_slots(Panel):
         col = row.column()
         col.template_list(
             "IMAGE_UL_render_slots", "render_slots", ima,
-            "render_slots", ima.render_slots, "active_index", rows=3
+            "render_slots", ima.render_slots, "active_index", rows=3,
         )
 
         col = row.column(align=True)



More information about the Bf-blender-cvs mailing list