Skip to content

[ShaderGraph] [2021.2] Fix for 1383046 #6451

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
Dec 9, 2021
Merged

[ShaderGraph] [2021.2] Fix for 1383046 #6451

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
9866ce5
Fix for 1383046 (already fixed in 2022.1+ via another much larger PR,…
Dec 2, 2021
04eba28
Adding changelog
Dec 2, 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
3 changes: 3 additions & 0 deletions com.unity.shadergraph/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
Version Updated
The version number for this package has increased due to a version update of a related graphics package.

### Fixed
- Fixed a validation error in ShaderGraph when using the SimpleNoise node both inside and outside a subgraph [1383046] (https://issuetracker.unity3d.com/issues/validation-error-is-usually-thrown-when-simple-noise-node-is-both-in-a-shadergraph-and-in-a-sub-graph)

## [12.1.2] - 2021-10-22

### Fixed
Expand Down
4 changes: 3 additions & 1 deletion com.unity.shadergraph/Editor/Data/Util/FunctionRegistry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ public void ProvideFunction(string name, GraphPrecision graphPrecision, Concrete
var startIndex = builder.length;
generator(builder);
var length = builder.length - startIndex;
var code = builder.ToString(startIndex, length);

// trim fixes mismatched whitespace issue when nodes come from subgraphs
var code = builder.ToString(startIndex, length).Trim();

// validate some assumptions around generics
bool isGenericName = name.Contains("$");
Expand Down