Merge branch 'blender-v2.81-release'

6 files changed, 12 insertions, 8 deletions

diff --git a/release/scripts/startup/bl_operators/rigidbody.py b/release/scripts/startup/bl_operators/rigidbody.py
index 4c014ff7ac4..97149133dec 100644
--- a/release/scripts/startup/bl_operators/rigidbody.py
+++ b/release/scripts/startup/bl_operators/rigidbody.py
@@ -147,8 +147,8 @@ class BakeToKeyframes(Operator):
                 scene.frame_set(f)
                 for j, obj in enumerate(objects):
                     mat = bake[i][j]
-                    # convert world space transform to parent space, so parented objects don't get offset after baking
-                    if (obj.parent):
+                    # Convert world space transform to parent space, so parented objects don't get offset after baking.
+                    if obj.parent:
                         mat = obj.matrix_parent_inverse.inverted() @ obj.parent.matrix_world.inverted() @ mat
 
                     obj.location = mat.to_translation()
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index c2b0eb5a8c2..581b6be886c 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -46,7 +46,11 @@ class MESH_MT_vertex_group_context_menu(Menu):
         layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT').use_topology = False
         layout.operator("object.vertex_group_mirror", text="Mirror Vertex Group (Topology)").use_topology = True
         layout.separator()
-        layout.operator("object.vertex_group_remove_from", icon='X', text="Remove from All Groups").use_all_groups = True
+        layout.operator(
+            "object.vertex_group_remove_from",
+            icon='X',
+            text="Remove from All Groups",
+        ).use_all_groups = True
         layout.operator("object.vertex_group_remove_from", text="Clear Active Group").use_all_verts = True
         layout.operator("object.vertex_group_remove", text="Delete All Unlocked Groups").all_unlocked = True
         layout.operator("object.vertex_group_remove", text="Delete All Groups").all = True
@@ -474,7 +478,7 @@ class DATA_PT_remesh(MeshButtonsPanel, Panel):
         mesh = context.mesh
         row.prop(mesh, "remesh_mode", text="Mode", expand=True)
         col = layout.column()
-        if (mesh.remesh_mode == 'VOXEL'):
+        if mesh.remesh_mode == 'VOXEL':
             col.prop(mesh, "remesh_voxel_size")
             col.prop(mesh, "remesh_voxel_adaptivity")
             col.prop(mesh, "use_remesh_fix_poles")
diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py
index 7ddfb298a1b..5fc03e59f9d 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -57,7 +57,7 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel):
 
         layout.prop(rd, "line_thickness_mode", expand=True)
 
-        if (rd.line_thickness_mode == 'ABSOLUTE'):
+        if rd.line_thickness_mode == 'ABSOLUTE':
             layout.prop(rd, "line_thickness")
 
 
diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index cb0dcb86ce4..fac8ff238c0 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -86,7 +86,7 @@ class DopesheetFilterPopoverBase:
             row = col.row(align=True)
             row.prop(dopesheet, "filter_text", text="")
 
-        if (not generic_filters_only) and (bpy.data.collections):
+        if (not generic_filters_only) and bpy.data.collections:
             col = layout.column(align=True)
             col.prop(dopesheet, "filter_collection", text="")
 
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_common.py b/release/scripts/startup/bl_ui/space_toolsystem_common.py
index 5a1398d0582..7c7825403a9 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_common.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_common.py
@@ -717,7 +717,7 @@ def _activate_by_item(context, space_type, item, index):
 
     handle_map = _activate_by_item._cursor_draw_handle
     handle = handle_map.pop(space_type, None)
-    if (handle is not None):
+    if handle is not None:
         WindowManager.draw_cursor_remove(handle)
     if item.draw_cursor is not None:
         def handle_fn(context, item, tool, xy):
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 531dff55719..afaf06d2320 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -453,7 +453,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
             # crease_pinch_factor
             if capabilities.has_pinch_factor:
                 row = col.row(align=True)
-                if (brush.sculpt_tool in ('BLOB', 'SNAKE_HOOK')):
+                if brush.sculpt_tool in {'BLOB', 'SNAKE_HOOK'}:
                     row.prop(brush, "crease_pinch_factor", slider=True, text="Magnify")
                 else:
                     row.prop(brush, "crease_pinch_factor", slider=True, text="Pinch")