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

[3.x] Backport exposing EditorResourcePicker and using it in the Inspector #49491

Merged

Conversation

YuriSizov
Copy link
Contributor

This backport includes:

  1. Exposing EditorResourcePicker and EditorScriptPicker (Add EditorResourcePicker control based on the Inspector editor for Resources #47260, with Make EditorFileDialog only created on demand in EditorResourcePicker #49068 bugfix).
  2. Use new controls in the editor's Inspector dock (Use EditorResourcePicker in the Inspector #48854).

Should be more or less the same as the master version. I've also noticed that there is no code for auto-converting some data types into their appropriate resources, the code is present in master. I saw no downside from including it, though I had to omit FontType -> Font conversion due to fonts being very different in 3.x.

All changes are split into individual commits related to each backported PR.

@YuriSizov YuriSizov added this to the 3.4 milestone Jun 10, 2021
@YuriSizov YuriSizov requested a review from a team as a code owner June 10, 2021 16:53
@YuriSizov YuriSizov force-pushed the editor-expose-resource-picker-3.x branch from 694fd1a to 0a77a7f Compare June 10, 2021 17:04
@YuriSizov
Copy link
Contributor Author

I have no idea what's wrong with macOS editor builds here. The errors highlighted make no sense as these are internal parts that I don't touch. So there is probably something else I didn't consider, specific to 3.x.

@YuriSizov YuriSizov force-pushed the editor-expose-resource-picker-3.x branch from 0a77a7f to b622dfa Compare June 11, 2021 10:32
@YuriSizov
Copy link
Contributor Author

Okay, fixed macOS problems (we don't use overrides in 3.x). Should be good to go.

@akien-mga akien-mga merged commit 72ae4ca into godotengine:3.x Jun 11, 2021
@akien-mga
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants