diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-05-10 15:38:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 15:38:53 +0200 |
| commit | 6ab92464bc6356f3342c3efd1fc1bb1a5e4467d5 (patch) | |
| tree | 405a85e89e036e2240c74ee850121d912e21704b /scene/resources/texture.cpp | |
| parent | 54b20a25b90c8c8d8dfd7f68d66d0ec57c71435f (diff) | |
| parent | 69de7ce38c40c57a1fabe12c9e5a3eab903a4035 (diff) | |
Merge pull request #38621 from akien-mga/stylé-comme-jamais
Style: clang-format: Disable if statements and case labels on single line
Diffstat (limited to 'scene/resources/texture.cpp')
| -rw-r--r-- | scene/resources/texture.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index d57af29599..91c40d871d 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -1037,8 +1037,10 @@ bool AtlasTexture::is_pixel_opaque(int p_x, int p_y) const { int y = p_y + region.position.y - margin.position.y; // margin edge may outside of atlas - if (x < 0 || x >= atlas->get_width()) return false; - if (y < 0 || y >= atlas->get_height()) return false; + if (x < 0 || x >= atlas->get_width()) + return false; + if (y < 0 || y >= atlas->get_height()) + return false; return atlas->is_pixel_opaque(x, y); } |