-
Notifications
You must be signed in to change notification settings - Fork 331
FIX: Address compilation warnings from Unity 6.4 and 6.5 #2295
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
base: develop
Are you sure you want to change the base?
Changes from all commits
db3bf37
42d4899
dbf7e2f
4b1105e
d210453
61fe912
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ | |
| // SearchFlags: these flags are used to customize how search is performed and how search | ||
| // results are displayed in the advanced object picker. | ||
| // Note: SearchFlags.Packages is not currently used and hides all results from packages. | ||
| internal static readonly SearchFlags PickerSearchFlags = SearchFlags.Sorted | SearchFlags.OpenPicker; | ||
| internal static readonly SearchFlags PickerSearchFlags = SearchFlags.OpenPicker; | ||
|
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. SearchFlags.Sorted is not relevant for picker, confirmed with Sebastien Grenier over Slack |
||
|
|
||
| // Search.SearchViewFlags : these flags are used to customize the appearance of the PickerWindow. | ||
| internal static readonly Search.SearchViewFlags PickerViewFlags = SearchViewFlags.DisableBuilderModeToggle | ||
|
|
@@ -84,7 +84,17 @@ | |
| var label = fetchObjectLabel(asset); | ||
| if (!label.Contains(context.searchText, System.StringComparison.InvariantCultureIgnoreCase)) | ||
| continue; // Ignore due to filtering | ||
| yield return provider.CreateItem(context, asset.GetInstanceID().ToString(), label, createItemFetchDescription(asset), | ||
|
|
||
| string itemId; | ||
|
|
||
| // 6.4 deprecated instance ids in favour of entity ids | ||
| #if UNITY_6000_4_OR_NEWER | ||
| itemId = asset.GetEntityId().ToString(); | ||
|
Check warning on line 92 in Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs
|
||
| #else | ||
| itemId = asset.GetInstanceID().ToString(); | ||
|
Check warning on line 94 in Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs
|
||
| #endif | ||
|
|
||
| yield return provider.CreateItem(context, itemId, label, createItemFetchDescription(asset), | ||
|
Check warning on line 97 in Packages/com.unity.inputsystem/InputSystem/Editor/PropertyDrawers/InputActionReferenceSearchProviders.cs
|
||
| null, asset); | ||
| } | ||
| } | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This constant wasn't used anywhere