Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## Unreleased

### Changes

- Made the ProBuilder Editor actions available in GameObject context in the action overlay.

## [6.1.2] - 2026-06-11

### Fixed
Expand Down
4 changes: 2 additions & 2 deletions Editor/Overlays/ProBuilderActionsOverlay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@
var shouldDisplay = action.group != ToolbarGroup.Tool && action.group != ToolbarGroup.Selection;

var hidden = action.hidden;
hidden |= (action.group == ToolbarGroup.Object) ? !isGOContext : isGOContext;
hidden |= shouldDisplayAsEditor || (action.group == ToolbarGroup.Object) ? !isGOContext : isGOContext;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1

shouldDisplayAsEditor is true for ToolbarGroup.Tool actions, and because ?: binds after || this line evaluates as (shouldDisplayAsEditor || action.group == ToolbarGroup.Object) ? !isGOContext : isGOContext. With the default Display Editors setting enabled, every editor action now gets hidden |= !isGOContext, so those buttons disappear as soon as the ProBuilder tool context is active. That is a regression from the previous behavior; the change adds GO-context visibility by removing PB-context visibility. Please treat tool-group actions as a separate case so they stay available in both contexts.

🤖 Helpful? 👍/👎

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1

This only fixes the panel/grid path. When the overlay is used as a horizontal or vertical toolbar, UpdateToolbar() still delegates to ProBuilderActionButton.UpdateContentForToolbar(), and that method keeps the old hidden |= (m_Action.group == ToolbarGroup.Object) ? !isGOContext : isGOContext rule. In those layouts the editor actions are still hidden in GameObjectToolContext, so the feature silently fails for a supported overlay mode. Please share the visibility logic between RefreshAvailableActions() and UpdateContentForToolbar() so both layouts behave the same way.

🤖 Helpful? 👍/👎


if (initActionButtons)
m_ActionButtons.Add( new ProBuilderActionButton(action) );
Expand Down Expand Up @@ -355,7 +355,7 @@
s_CurrentMode == DisplayMode.Icon ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal);
menu.AppendAction(L10n.Tr("Text Mode"), _ => { SetMode(DisplayMode.Text); },
s_CurrentMode == DisplayMode.Text ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal);
menu.AppendAction(L10n.Tr("Text & Icon Mode"), _ => { SetMode(DisplayMode.Full); },
menu.AppendAction(L10n.Tr("Text+Icon Mode"), _ => { SetMode(DisplayMode.Full); },

Check warning on line 358 in Editor/Overlays/ProBuilderActionsOverlay.cs

View check run for this annotation

Codecov GitHub.com / codecov/patch

Editor/Overlays/ProBuilderActionsOverlay.cs#L358

Added line #L358 was not covered by tests
s_CurrentMode == DisplayMode.Full ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal);
menu.AppendSeparator();
}
Expand Down