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

Properly handle empty CSGCombiners #40919

Merged
merged 1 commit into from
Aug 11, 2020
Merged

Conversation

hoontee
Copy link
Contributor

@hoontee hoontee commented Jul 31, 2020

Fixes "Cannot get CSGBrush" error spam.
Fixes #24696.
Fixes #40782.

Copy link
Contributor

@madmiraal madmiraal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My only concern with this change is that there is a slight break in compact in that the Operation of the first CSGShape in the CSGCombiner is now relevant. If it is set to anything but Union (i.e Subtraction or Intersection) it won't be copied, and it will result in nothing. However, this is easily fixed by setting it to Union which is the default.

@madmiraal madmiraal added bug cherrypick:3.x Considered for cherry-picking into a future 3.x release topic:core labels Jul 31, 2020
@madmiraal madmiraal added this to the 4.0 milestone Jul 31, 2020
@akien-mga akien-mga merged commit 920f8c8 into godotengine:master Aug 11, 2020
@akien-mga
Copy link
Member

Thanks!

@hoontee hoontee deleted the master-2 branch August 11, 2020 21:02
@akien-mga
Copy link
Member

Cherry-picked for 3.2.4.

@akien-mga akien-mga removed the cherrypick:3.x Considered for cherry-picking into a future 3.x release label Sep 24, 2020
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.

CSGCombiner lighting breaks every other time visibility is toggled CSGCombiner - CSG Geometry disappearing
3 participants