Skip to content

Conversation

arkology
Copy link
Contributor

Backport #99685 to 3.x to make everyone happy.
Closes #46266 Closes #96859

godot windows tools 64_sy7BmRR3eu

@arkology arkology requested a review from a team as a code owner November 30, 2024 09:34
@arkology arkology changed the title Show TextureProgress radial center cross only when editing the scene [3.x] Show TextureProgress radial center cross only when editing the scene Nov 30, 2024
@Chaosus Chaosus added this to the 3.x milestone Nov 30, 2024
@lawnjelly
Copy link
Member

Although we often favour local solutions, in this case I'm wondering whether we should just backport is_part_of_edited_scene() function.

It may end up being used in multiple places (with more cherry picks), and it would be nice to have it centralized in case of future changes.

Other than that, this looks fine to me. 👍

@arkology
Copy link
Contributor Author

arkology commented Jun 3, 2025

Although we often favour local solutions, in this case I'm wondering whether we should just backport is_part_of_edited_scene() function.

It may end up being used in multiple places (with more cherry picks), and it would be nice to have it centralized in case of future changes.

I think this could be done in separate PR after merging current PR.
This PR just backports simple one-line fix from 4.x branch.

@lawnjelly lawnjelly merged commit b6b3ec5 into godotengine:3.x Jun 3, 2025
14 checks passed
@lawnjelly
Copy link
Member

Thanks!

@AThousandShips AThousandShips modified the milestones: 3.x, 3.7 Jun 3, 2025
@arkology
Copy link
Contributor Author

arkology commented Jun 3, 2025

@lawnjelly thank you!)

@arkology arkology deleted the 3.x_texture-progress-cross-plugin-friendly branch June 3, 2025 12:27
@lawnjelly lawnjelly added cherrypick:3.6 Considered for cherry-picking into a future 3.6.x release and removed cherrypick:3.6 Considered for cherry-picking into a future 3.6.x release labels Jun 13, 2025
@lawnjelly
Copy link
Member

Cherry-picked for 3.6.1.

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.

4 participants