Skip to content
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.

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

[2021.1] Fixed terrain and speed tree shaders missing XR macros #3209

Merged

Conversation

thomas-zeng
Copy link
Contributor

@thomas-zeng thomas-zeng commented Jan 21, 2021


Purpose of this PR

This is a backport of #2663


Testing status

  • ABV

Comments to reviewers

Notes for the reviewers you have assigned.

* Fixed terrain and speed tree shaders missing XR macros.

* Fixed speedtreev8 shader issue.
@github-actions
Copy link

It appears that you made a non-draft PR!
Please convert your PR to draft (button on the right side of the page)
and cancel any jobs that started on Yamato.
See the PR template for more information.
Thank you!

Copy link
Contributor

@Verasl Verasl left a comment

Choose a reason for hiding this comment

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

LGTM

@thomas-zeng thomas-zeng added the ready-to-merge Add this tag whenever your PR is ready to be merged. i.e, non draft, all reviewers approved, ABV label Feb 26, 2021
@thomas-zeng
Copy link
Contributor Author

Rerun failed tests and they are passing now. This PR is ready to land.

@phi-lira phi-lira merged commit ae49df3 into 2021.1/staging Mar 2, 2021
@phi-lira phi-lira deleted the 2021.1/universal/xr/fix-terrain-tree-backport branch March 2, 2021 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Add this tag whenever your PR is ready to be merged. i.e, non draft, all reviewers approved, ABV universal XR
Projects
None yet
3 participants