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

#1493: Add explicit command to reset the texture of a brush. #1497

Merged
merged 1 commit into from
Oct 22, 2016

Conversation

kduske
Copy link
Collaborator

@kduske kduske commented Oct 21, 2016

@ericwa this should fix #1493. Could you have quick look around?

@kduske kduske added this to the TrenchBroom 2.0.0 milestone Oct 21, 2016
@kduske
Copy link
Collaborator Author

kduske commented Oct 21, 2016

Hmm, why can't I see the Travis and Appveyor builds anymore?

@@ -147,11 +147,16 @@ namespace TrenchBroom {
if (m_texture != NULL) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

It doesn't look like setTexture() is ever called with null now.
Add an expect(texture != null, "can't set texture to null");?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes, it can still be called with a NULL texture, see MapDocument::UnsetTextures. The difference is that setTexture(NULL) doesn't change the texture name while unsetTexture does.

@ericwa
Copy link
Collaborator

ericwa commented Oct 21, 2016

Looks good and works for me!

@ericwa
Copy link
Collaborator

ericwa commented Oct 21, 2016

Hmm, why can't I see the Travis and Appveyor builds anymore?

They're showing up for me if I click "Show all checks". Maybe it was just the Github outage earlier today?

@kduske kduske merged commit bb894e9 into release/v2.0.0 Oct 22, 2016
@kduske kduske deleted the feature/1493 branch November 6, 2017 20:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants