diff --git a/CHANGELOG.md b/CHANGELOG.md index 622b852d8..755f8d412 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Editor/Overlays/ProBuilderActionsOverlay.cs b/Editor/Overlays/ProBuilderActionsOverlay.cs index a2fc13b87..bf968505f 100644 --- a/Editor/Overlays/ProBuilderActionsOverlay.cs +++ b/Editor/Overlays/ProBuilderActionsOverlay.cs @@ -314,7 +314,7 @@ private void RefreshAvailableActions() 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; if (initActionButtons) m_ActionButtons.Add( new ProBuilderActionButton(action) ); @@ -355,7 +355,7 @@ void BuildContextMenu(ContextualMenuPopulateEvent evt) 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); }, s_CurrentMode == DisplayMode.Full ? DropdownMenuAction.Status.Checked : DropdownMenuAction.Status.Normal); menu.AppendSeparator(); }