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.

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

[21.2] Fixed regression issues introduced by PR4458 #4785

Merged
merged 2 commits into from
Jun 3, 2021
Merged

[21.2] Fixed regression issues introduced by PR4458 #4785

merged 2 commits into from
Jun 3, 2021

Conversation

thomas-zeng
Copy link
Contributor

Purpose of this PR

  • Fixed issues when xr defines are disabled. The issue is introduced by previous PR which breaks nightly tests

Testing status

  • ABV

Comments to reviewers

  • Properly guarded the XR code within XR defines.

@thomas-zeng thomas-zeng requested review from a team as code owners June 3, 2021 17:31
@github-actions
Copy link

github-actions bot commented Jun 3, 2021

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!

@thomas-zeng
Copy link
Contributor Author

URPUpdate_Top_Asset_Store failure could be found in a recent master ABV run and is not introduced by this PR:
https://yamato.cds.internal.unity3d.com/jobs/902-Graphics/tree/master/.yamato%252Furpupdate_top_asset_store-win-dx11.yml%2523URPUpdate_Top_Asset_Store_Win_DX11_playmode_mono_Linear_trunk/7074150/job

@thomas-zeng thomas-zeng added ready-to-merge Add this tag whenever your PR is ready to be merged. i.e, non draft, all reviewers approved, ABV XR labels Jun 3, 2021
@stramit stramit merged commit 9196455 into master Jun 3, 2021
@stramit stramit deleted the universal/xr/fix-xr-compile-error branch June 3, 2021 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ellioman ellioman ellioman approved these changes

@stramit stramit stramit approved these changes

Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thomas-zeng @ellioman @stramit