diff --git a/scripts/startup/bl_ui/properties_data_curve.py b/scripts/startup/bl_ui/properties_data_curve.py index a46e849b775..3f93210ea8f 100644 --- a/scripts/startup/bl_ui/properties_data_curve.py +++ b/scripts/startup/bl_ui/properties_data_curve.py @@ -371,10 +371,18 @@ class DATA_PT_font(CurveButtonsPanelText, Panel): row.prop(char, "use_small_caps", toggle=True) else: row = layout.row(align=True) - row.operator("font.style_toggle", text="Bold", icon='BOLD' , depress = text.is_select_bold).style = 'BOLD' - row.operator("font.style_toggle", text="Italic", icon='ITALIC' , depress = text.is_select_italic).style = 'ITALIC' - row.operator("font.style_toggle", text="Underline", icon='UNDERLINE' , depress = text.is_select_underline).style = 'UNDERLINE' - row.operator("font.style_toggle", text="Small Caps", icon='SMALL_CAPS' , depress = text.is_select_smallcaps).style = 'SMALL_CAPS' + row.operator( + "font.style_toggle", text="Bold", icon='BOLD', depress=text.is_select_bold, + ).style = 'BOLD' + row.operator( + "font.style_toggle", text="Italic", icon='ITALIC', depress=text.is_select_italic, + ).style = 'ITALIC' + row.operator( + "font.style_toggle", text="Underline", icon='UNDERLINE', depress=text.is_select_underline, + ).style = 'UNDERLINE' + row.operator( + "font.style_toggle", text="Small Caps", icon='SMALL_CAPS', depress=text.is_select_smallcaps, + ).style = 'SMALL_CAPS' class DATA_PT_font_transform(CurveButtonsPanelText, Panel): diff --git a/scripts/startup/bl_ui/space_node.py b/scripts/startup/bl_ui/space_node.py index 564c53ca815..4b40d203c6d 100644 --- a/scripts/startup/bl_ui/space_node.py +++ b/scripts/startup/bl_ui/space_node.py @@ -903,7 +903,10 @@ class NodeTreeInterfacePanel(Panel): props = property_row.operator_menu_enum( "node.tree_socket_change_subtype", "socket_subtype", - text=active_socket.bl_subtype_label if active_socket.bl_subtype_label else active_socket.bl_idname + text=( + active_socket.bl_subtype_label if active_socket.bl_subtype_label else + active_socket.bl_idname + ), ) layout.use_property_split = True diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc index ecf7951e149..9bf0823aa35 100644 --- a/source/blender/geometry/intern/realize_instances.cc +++ b/source/blender/geometry/intern/realize_instances.cc @@ -939,8 +939,8 @@ static AllMeshesInfo preprocess_meshes(const GeometrySet &geometry_set, mesh_info.stored_vertex_ids = ids_attribute.varray.get_internal_span().typed(); } } - mesh_info.material_indices =* - attributes.lookup_or_default("material_index", ATTR_DOMAIN_FACE, 0); + mesh_info.material_indices = *attributes.lookup_or_default( + "material_index", ATTR_DOMAIN_FACE, 0); } info.no_loose_edges_hint = std::all_of( diff --git a/source/blender/io/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h index 7b4188785fd..c10997637e0 100644 --- a/source/blender/io/collada/MeshImporter.h +++ b/source/blender/io/collada/MeshImporter.h @@ -92,10 +92,7 @@ class MeshImporter : public MeshImporterBase { * A pair/of geom UID and mat UID, one geometry can have several materials. */ std::multimap materials_mapped_to_geom; - bool set_poly_indices(int *poly_verts, - int loop_index, - const uint *indices, - int loop_count); + bool set_poly_indices(int *poly_verts, int loop_index, const uint *indices, int loop_count); void set_face_uv(blender::float2 *mloopuv, UVDataWrapper &uvs,