diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-02-14 12:54:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 12:54:33 +0100 |
| commit | 6b184e4d3b4f02c3bb04fa7a36fe65176f89ec3f (patch) | |
| tree | 6394ae40fe795ff7989d893f70b40e9e5cc8bcee /scene/resources | |
| parent | f981e9fe915532d6902912c5e038c30f8baf3ed5 (diff) | |
| parent | 9418f6a557e0a0d9233cbdc4f222e3a5d9fd3a39 (diff) | |
Merge pull request #25717 from nekomatata/dynamic-font-settings-fix
Fixed undefined behavior when loading dynamic font settings
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/dynamic_font.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scene/resources/dynamic_font.h b/scene/resources/dynamic_font.h index 39e81ca43d..887c7b42c8 100644 --- a/scene/resources/dynamic_font.h +++ b/scene/resources/dynamic_font.h @@ -54,8 +54,9 @@ public: struct { uint32_t size : 16; uint32_t outline_size : 8; - bool mipmaps : 1; - bool filter : 1; + uint32_t mipmaps : 1; + uint32_t filter : 1; + uint32_t unused : 6; }; uint32_t key; }; |