Skip to content

[ShaderGraph][2022.1] Fix for 1354463 - subgraph node inputs should match property list on subgraph #5700

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

Jump to bottom
Merged
merged 2 commits into from
Sep 17, 2021
Merged

[ShaderGraph][2022.1] Fix for 1354463 - subgraph node inputs should match property list on subgraph #5700

merged 2 commits into from
Sep 17, 2021

Conversation

jessebarker
Copy link
Contributor

@jessebarker jessebarker commented Sep 16, 2021 •
edited
Loading

Purpose of this PR

This PR fixes https://fogbugz.unity3d.com/f/cases/1354463/

When the blackboard categories were added, the ordering of properties and subgraph node inputs got decoupled. So, if a user wants to reorder the properties on the subgraph, a shader graph using that subgraph as a node would see a different ordering. This PR makes it so that the property ordering is preserved (both on the input to the node, and in the generated code).

Testing status

Manual testing according to the repro case in the bug report. Also, the same basic steps, but with more properties.

Just in case this goes away from "checks"
PR ShaderGraph on trunk

Comments to reviewers

Notes for the reviewers you have assigned.

@github-actions
Copy link

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://yamato.cds.internal.unity3d.com/jobs/902-Graphics
Search for your PR branch using the sidebar on the left, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

Shader Graph
/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_trunk
Depending on your PR, you may also want
/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_trunk
/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_trunk

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

Nightmask3
Nightmask3 approved these changes Sep 16, 2021
View reviewed changes
Copy link
Contributor

@Nightmask3 Nightmask3 left a comment

Choose a reason for hiding this comment

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

looks good to me!

@jessebarker
Bump the ScriptedImporter version and handle older upgrades
834be77 
    - For older assets that were created before categories existed,
      we won't have category data (no ordered properties on the categories),
      but we still need to pull those properties in.
@jessebarker jessebarker mentioned this pull request Sep 17, 2021
Merged
@jessebarker jessebarker marked this pull request as ready for review September 17, 2021 18:22
@jessebarker jessebarker requested a review from a team as a code owner September 17, 2021 18:22
@jessebarker jessebarker merged commit 54d4ca0 into master Sep 17, 2021
@jessebarker jessebarker deleted the sg-fix-1354463 branch September 17, 2021 18:53
@sebastienlagarde
Copy link
Contributor

hey, the PR is tagged as need backport for 21.2 but have title ruby, expected?

@jessebarker
Copy link
Contributor Author

hey, the PR is tagged as need backport for 21.2 but have title ruby, expected?

Sorry, forgot to update the tag to 'backported-2021.2'. Just did that. Backport PR is #5716

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Nightmask3 Nightmask3 Nightmask3 approved these changes

+1 more reviewer

@cdxntchou cdxntchou cdxntchou approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backported-2021.2 Shader Graph

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jessebarker @sebastienlagarde @Nightmask3 @cdxntchou