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

Jump to bottom
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

merged 2 commits into from
Sep 29, 2021

Conversation

Nightmask3
Copy link
Contributor

Purpose of this PR

Backport of PR: #5818

Fixes bug: https://fogbugz.unity3d.com/f/cases/1348910/ in the 2021.2 branch

@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_2021.2
Depending on your PR, you may also want
/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_2021.2
/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_2021.2

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 marked this pull request as ready for review September 28, 2021 19:05
@Nightmask3 Nightmask3 requested a review from a team as a code owner September 28, 2021 19:05
jessebarker
jessebarker approved these changes Sep 28, 2021
View reviewed changes
Copy link
Contributor

@jessebarker jessebarker left a comment

Choose a reason for hiding this comment

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

LGTM

@Nightmask3
Copy link
Contributor Author

image

The one failure seems (OSX_Metal_playmode) seems to be a false positive test failure, think it can be ignored

@Nightmask3 Nightmask3 requested review from bencloward and removed request for xiaoxicici September 28, 2021 21:48
bencloward
bencloward approved these changes Sep 28, 2021
View reviewed changes
Copy link
Contributor

@bencloward bencloward left a comment

Choose a reason for hiding this comment

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

Tested this in 2021.2 and it's working correctly. Nice!

@jessebarker
Copy link
Contributor

image

The one failure seems (OSX_Metal_playmode) seems to be a false positive test failure, think it can be ignored

Indeed, the editor exited with a weird error code (139 - text file busy, which is likely to be an issue with the logging itself).

@Nightmask3 Nightmask3 merged commit 29dd059 into 2021.2/staging Sep 29, 2021
@Nightmask3 Nightmask3 deleted the sg/backport-fix-category-add-input-undo branch September 29, 2021 17:41
Lenadros pushed a commit to neelbedekar/Graphics that referenced this pull request Oct 4, 2021
@thomas-zeng @phi-lira
[10.x] Forward port hotfix for Hololens Remote Rendering (Unity-Techn…
5a9db61 
…ologies#4453)

* Hotfix for Hololens Remote Rendering (Unity-Technologies#5830)

* Hotfix for Hololens.

* Added changelog.

* Adding a if statement suggested by MS

Co-authored-by: Elvar Örn Unnþórsson <ellioman@ellioman.com>

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
#	com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs
#	com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs

* Fixed merge error.

* Fixed formatting.

* Fixed code issue with latest URP.

* Change to check cameraData instead of camera.

* Addressed code feedback.

* Addressed feedback from reviewers.

Co-authored-by: Felipe Lira <felipedrl@gmail.com>
Wilfrid-Unity pushed a commit to Wilfrid-Unity/Graphics that referenced this pull request Nov 25, 2021
@thomas-zeng
[2021.1] Forward port hotfix for Hololens Remote Rendering (Unity-Tec…
9eba745 
…hnologies#4639)

* [10.x] Forward port hotfix for Hololens Remote Rendering (Unity-Technologies#4453)

* Hotfix for Hololens Remote Rendering (Unity-Technologies#5830)

* Hotfix for Hololens.

* Added changelog.

* Adding a if statement suggested by MS

Co-authored-by: Elvar Örn Unnþórsson <ellioman@ellioman.com>

# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
#	com.unity.render-pipelines.universal/Runtime/ForwardRenderer.cs
#	com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs

* Fixed merge error.

* Fixed formatting.

* Fixed code issue with latest URP.

* Change to check cameraData instead of camera.

* Addressed code feedback.

* Addressed feedback from reviewers.

Co-authored-by: Felipe Lira <felipedrl@gmail.com>
# Conflicts:
#	com.unity.render-pipelines.universal/CHANGELOG.md
#	com.unity.render-pipelines.universal/Runtime/UniversalRenderPipelineCore.cs

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

Reviewers

@jessebarker jessebarker jessebarker approved these changes

@bencloward bencloward bencloward approved these changes

Assignees

No one assigned

Labels

Shader Graph

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@Nightmask3 @jessebarker @bencloward