Skip to content

[2021.2][SG] Backport of fix to exceptions being thrown on undo-ing adding inputs to a category #5830

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 2 commits into from
Sep 29, 2021
Merged

[2021.2][SG] Backport of fix to exceptions being thrown on undo-ing adding inputs to a category #5830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e875d0a
created backport for bugfix 1348910
Nightmask3 Sep 28, 2021
56974d4
ran formatter
Nightmask3 Sep 28, 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 @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [12.0.0] - 2021-01-11

### Added
- Fixed bug where an exception was thrown on undo operation after adding properties to a category [1348910] (https://fogbugz.unity3d.com/f/cases/1348910/)
- Added categories to the blackboard, enabling more control over the organization of shader properties and keywords in the Shader Graph tool. These categories are also reflected in the Material Inspector for URP + HDRP, for materials created from shader graphs.
- Added ability to define custom vertex-to-fragment interpolators.
- Support for the XboxSeries platform has been added.
Expand Down
15 changes: 9 additions & 6 deletions com.unity.shadergraph/Editor/Drawing/Blackboard/SGBlackboardCategory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,15 @@ void OnMouseDownEvent(MouseDownEvent e)
OpenTextEditor();
e.PreventDefault();
}
else if (e.clickCount == 1 && e.button == (int)MouseButton.LeftMouse && IsRenamable())
{
// Select the child elements within this category (the field views)
var fieldViews = this.Query<SGBlackboardField>();
foreach (var child in fieldViews.ToList())
{
this.AddToSelection(child);
}
}
}

internal void OpenTextEditor()
Expand Down Expand Up @@ -664,12 +673,6 @@ public override void Select(VisualElement selectionContainer, bool additive)
public override void OnSelected()
{
AddToClassList("selected");
// Select the child elements within this category (the field views)
var fieldViews = this.Query<SGBlackboardField>();
foreach (var child in fieldViews.ToList())
{
this.AddToSelection(child);
}
}

public override void OnUnselected()
Expand Down