Skip to content

Fix for graph settings inspector switching #4119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 16, 2021
Merged

Fix for graph settings inspector switching #4119

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6885a3
adding static flag that we turn off when pdating inspector from targe…
elizabeth-legros Apr 7, 2021
78e8a42
Update CHANGELOG.md
elizabeth-legros Apr 7, 2021
0efdb3c
Merge branch 'master' into sg/fix-for-inspector-selection
elizabeth-legros Apr 14, 2021
c7f63ee
adding comments to code
elizabeth-legros Apr 15, 2021
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
1 change: 1 addition & 0 deletions com.unity.shadergraph/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Fixed an issue where a requirement was placed on a fixed-function emission property [1319637]
- Fixed default shadergraph precision so it matches what is displayed in the graph settings UI (single) [1325934]
- Fixed an unhelpful error message when custom function nodes didn't have a valid file [1323493].
- Fixed a bug where changing a Target setting would switch the inspector view to the Node Settings tab if any nodes were selected.
- Fixed "Disconnect All" option being grayed out on stack blocks [1313201].
- Fixed how shadergraph's prompt for "unsaved changes" was handled to fix double messages and incorrect window sizes [1319623].
- Fixed an issue where generated property reference names could conflict with Shader Graph reserved keywords [1328762] (https://issuetracker.unity3d.com/product/unity/issues/guid/1328762/)
Expand Down
4 changes: 3 additions & 1 deletion com.unity.shadergraph/Editor/Drawing/Inspector/InspectorView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class InspectorView : GraphSubWindow

Label m_MaxItemsMessageLabel;

internal static bool forceNodeView = true;

void RegisterPropertyDrawer(Type newPropertyDrawerType)
{
if (typeof(IPropertyDrawer).IsAssignableFrom(newPropertyDrawerType) == false)
Expand Down Expand Up @@ -132,7 +134,7 @@ public void Update()
if (m_CurrentlyInspectedElementsCount == k_InspectorElementLimit)
m_NodeSettingsContainer.Add(m_MaxItemsMessageLabel);
}
if (anySelectables)
if (anySelectables && forceNodeView)
{
// Anything selectable in the graph (GraphSettings not included) is only ever interacted with through the
// Node Settings tab so we can make the assumption they want to see that tab
Expand Down
2 changes: 2 additions & 0 deletions com.unity.shadergraph/Editor/Drawing/Views/MaterialGraphView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@ void ChangeTargetSettings()

graph.UpdateActiveBlocks(activeBlocks);
this.m_PreviewManagerUpdateDelegate();
Inspector.InspectorView.forceNodeView = false;
this.m_InspectorUpdateDelegate();
Inspector.InspectorView.forceNodeView = true;
}

void ChangePrecision(GraphPrecision newGraphDefaultPrecision)
Expand Down