diff --git a/scripts/startup/bl_ui/properties_paint_common.py b/scripts/startup/bl_ui/properties_paint_common.py index 5984b325ba6..982e09d7a57 100644 --- a/scripts/startup/bl_ui/properties_paint_common.py +++ b/scripts/startup/bl_ui/properties_paint_common.py @@ -1414,10 +1414,10 @@ def brush_basic_gpencil_weight_settings(layout, _context, brush, *, compact=Fals row = layout.row(align=True) row.prop(brush, "strength", slider=True) row.prop(brush, "use_pressure_strength", text="") - + if brush.gpencil_weight_tool in {'WEIGHT'}: layout.prop(brush, "weight", slider=True) - + gp_settings = brush.gpencil_settings layout.prop(gp_settings, "direction", expand=True, text="" if compact else "Direction") diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 36827670145..81c1fe5f159 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -414,11 +414,11 @@ class _draw_tool_settings_context_mode: return False paint = context.tool_settings.gpencil_weight_paint brush = paint.brush - + layout.template_ID_preview(paint, "brush", rows=3, cols=8, hide_buttons=True) - + brush_basic_gpencil_weight_settings(layout, context, brush, compact=True) - + layout.popover("VIEW3D_PT_tools_grease_pencil_weight_options", text="Options") layout.popover("VIEW3D_PT_tools_grease_pencil_brush_weight_falloff", text="Falloff") @@ -7666,7 +7666,7 @@ class VIEW3D_PT_gpencil_weight_context_menu(Panel): settings = tool_settings.gpencil_weight_paint brush = settings.brush layout = self.layout - + # Weight settings brush_basic_gpencil_weight_settings(layout, context, brush) diff --git a/scripts/startup/bl_ui/space_view3d_toolbar.py b/scripts/startup/bl_ui/space_view3d_toolbar.py index 442a6ee952d..5a9dcf85e42 100644 --- a/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -2023,7 +2023,7 @@ class VIEW3D_PT_tools_grease_pencil_weight_paint_settings(Panel, View3DPanel, Gr def draw(self, context): if self.is_popover: return - + layout = self.layout layout.use_property_split = True layout.use_property_decorate = False @@ -2055,13 +2055,13 @@ class VIEW3D_PT_tools_grease_pencil_brush_weight_falloff(GreasePencilBrushFallof class VIEW3D_PT_tools_grease_pencil_weight_options(Panel, View3DPanel, GreasePencilWeightPanel): bl_label = "Options" bl_options = {'DEFAULT_CLOSED'} - + def draw(self, context): layout = self.layout layout.use_property_split = True layout.use_property_decorate = False tool_settings = context.scene.tool_settings - + col = layout.column() col.prop(tool_settings, "use_auto_normalize", text="Auto Normalize") diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 3e64fdcdea5..4828ef03679 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -3665,7 +3665,8 @@ static bool do_mesh_box_select(ViewContext *vc, } if (ts->selectmode & SCE_SELECT_EDGE) { /* Does both use_zbuf and non-use_zbuf versions (need screen cos for both) */ - struct BoxSelectUserData_ForMeshEdge cb_data {}; + struct BoxSelectUserData_ForMeshEdge cb_data { + }; cb_data.data = &data; cb_data.esel = use_zbuf ? esel : nullptr; cb_data.backbuf_offset = use_zbuf ? DRW_select_buffer_context_offset_for_object_elem(