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

Fix custom resources using incorrect icons #94854

Merged
merged 1 commit into from
Aug 16, 2024

Conversation

ianmccleary
Copy link
Contributor

Fix #93874
Fix #92942

Instead of going by the first dependency, go by the icon linked to the resource's script class (if it has one)
I'm unsure if the rest of the function is necessary (or what cases it covers really) but I chose to leave it in for safety's sake. I'm not familiar enough with the code base to make that assumption confidently.
Please let me know if there's anything I missed or failed to consider!

@AThousandShips AThousandShips added bug topic:editor cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release labels Jul 28, 2024
@AThousandShips AThousandShips added this to the 4.4 milestone Jul 28, 2024
@AThousandShips AThousandShips requested a review from a team July 28, 2024 07:38
@KoBeWi
Copy link
Member

KoBeWi commented Aug 13, 2024

Needs to be squashed into one commit.

@AThousandShips

This comment was marked as resolved.

@ianmccleary ianmccleary force-pushed the custom-resource-icon-fix branch from 8b78db9 to 5b1f3ec Compare August 14, 2024 17:07
@ianmccleary ianmccleary force-pushed the custom-resource-icon-fix branch from 5b1f3ec to 140f9dc Compare August 14, 2024 17:18
@ianmccleary
Copy link
Contributor Author

Commits squashed, should be good to go. Let me know if anything else needs to be done 😄

@akien-mga akien-mga merged commit 58020c8 into godotengine:master Aug 16, 2024
18 checks passed
@akien-mga
Copy link
Member

akien-mga commented Aug 16, 2024

Thanks! And congrats for your first merged Godot contribution 🎉

@akien-mga
Copy link
Member

Cherry-picked for 4.3.1.

@akien-mga akien-mga removed the cherrypick:4.3 Considered for cherry-picking into a future 4.3.x release label Sep 16, 2024
@akien-mga akien-mga removed the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label Mar 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants