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

Revert #52647 (Don't update CSG Shape when not inside tree) #58958

Merged
merged 1 commit into from
Mar 10, 2022

Conversation

hoontee
Copy link
Contributor

@hoontee hoontee commented Mar 9, 2022

Reverts #52647.
Fixes #54445.
#52642 stays fixed, presumably due to #40814.

@hoontee hoontee requested a review from a team as a code owner March 9, 2022 23:32
@Calinou Calinou added this to the 4.0 milestone Mar 9, 2022
@hoontee hoontee changed the title Revert #52647 Revert #52647 (Don't update CSG Shape when not inside tree) Mar 9, 2022
@akien-mga akien-mga requested a review from timothyqiu March 10, 2022 06:58
Copy link
Member

@timothyqiu timothyqiu 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 👍

My PR created a situation where it's dirty but no _update_shape() is processed. So later _make_dirty() will never update anything. Sorry for that :(

#52642 is indeed fixed by #40814.

@akien-mga akien-mga merged commit 277b0dd into godotengine:master Mar 10, 2022
@akien-mga
Copy link
Member

Thanks!

@akien-mga akien-mga added cherrypick:3.4 and removed cherrypick:3.4 cherrypick:3.x Considered for cherry-picking into a future 3.x release labels Mar 10, 2022
@akien-mga
Copy link
Member

@hoontee @timothyqiu I need some advice to decide what to do for 3.4. #40814 was backported to 3.x and thus fixes the original issue, but I think it needs some testing in a few betas before it can be considered to cherry-pick in 3.4 (if at all).

So we're left with a regression in 3.4 which can be fixed by cherry-picking this revert, but that would reintroduce #52642 IIUC. What would you suggest?

@hoontee
Copy link
Contributor Author

hoontee commented Mar 11, 2022

@akien-mga Ideally we would want to cherry-pick #58938 for its numerous fixes, however if that can't happen, I don't believe this one should be cherry-picked. The error in #52642 slows down the editor when there are several Paths.

Of course, not seeing any CSGShapes in other scenes sucks too, so if it's decided that CSGPolygon paths are too rare then maybe you should cherry-pick this. Hard to make a call.

@timothyqiu
Copy link
Member

@akien-mga #52642 is mostly annoyance I think. Cherry-picking this revert brings correctness.

@akien-mga
Copy link
Member

Cherry-picked for 3.4.4.

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.

CSG's not on the current scene tab fail to render on project load
4 participants