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

Eliminate API conversion popup when loading in Unity 2017.1 #2061

Merged
merged 7 commits into from
May 8, 2018
Merged

Eliminate API conversion popup when loading in Unity 2017.1 #2061

merged 7 commits into from
May 8, 2018

Conversation

david-c-kline
Copy link

Add UNITY_2017_1_OR_NEWER blocks (and modify some existing 2017_2 blocks) to eliminate the API conversion popup when loading the MRTK in Unity 2017.1

There isn't an issue for this, it is an extension of #1921.

@@ -103,12 +103,20 @@ public override SupportedInputInfo GetSupportedInputInfo(uint sourceId)

if (SupportsPosition)
{
#if UNITY_2017_1_OR_NEWER
Copy link
Contributor

Choose a reason for hiding this comment

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

I think these should just be switched straight up. The source is obsolete for all versions, not just 2017.1 or newer.

{
// The input source must provide positional data for this script to be usable
return;
}
#endif
#endif // UNITY_2017_2_OR_NEWER
Copy link
Contributor

Choose a reason for hiding this comment

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

is this right?

Copy link
Author

Choose a reason for hiding this comment

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

nope. i fixed it in fb3fc50

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

image

Copy link
Contributor

@keveleigh keveleigh May 8, 2018

Choose a reason for hiding this comment

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

The PR had been updated

image

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, your red lines don't match up. There's an #endif between them

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks good for me now.

@@ -0,0 +1,10 @@
fileFormatVersion: 2
guid: 59c43794cfe522246aaa1d4a04cadf68
Copy link
Contributor

Choose a reason for hiding this comment

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

What's this from?

Copy link
Author

Choose a reason for hiding this comment

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

I missed adding this file as part of #2052

StephenHodgson
StephenHodgson previously approved these changes May 8, 2018
Copy link
Contributor

@StephenHodgson StephenHodgson 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

@StephenHodgson
Copy link
Contributor

Do we have a PR for dev branch?

Organizing usings and fixing 2017.1 build errors in SpectatorView
@david-c-kline david-c-kline merged commit a1ed93c into microsoft:may18_dev May 8, 2018
@david-c-kline david-c-kline deleted the warningCleanup branch May 8, 2018 23:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants