Fix Sprite3d using AtlasTexture... Again. #18691
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
akien-mga
reviewed
May 8, 2018
scene/3d/sprite_3d.cpp
Outdated
|
|
||
| // Properly setup UVs for impostor textures (AtlasTexture). | ||
| Ref<AtlasTexture> atlas_tex = texture; | ||
| if (atlas_tex != nullptr) { |
There was a problem hiding this comment.
We don't use nullptr:
scene/3d/sprite_3d.cpp: In member function 'virtual void Sprite3D::_draw()':
scene/3d/sprite_3d.cpp:374:19: error: 'nullptr' was not declared in this scope
if (atlas_tex != nullptr) {
^
scene/3d/sprite_3d.cpp: In member function 'virtual void AnimatedSprite3D::_draw()':
scene/3d/sprite_3d.cpp:674:19: error: 'nullptr' was not declared in this scope
if (atlas_tex != nullptr) {
^
There was a problem hiding this comment.
Could you also edit the commit log to something more meaningful? The current log only makes sense if you follow the whole history back to @reduz's comment on GitHub, but doesn't say anything about what this commit actually does (fixing AtlasTexture usage in Sprite3D).
Changes as requested in b484d5c.
|
it's fine now, thanks! :) |
|
Cherry-picked for 3.0.7. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As requested in b484d5c, now it doesn't query the VisualServer any more.
@reduz, please let me know if I'm doing something wrong here.