diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-03 19:05:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 19:05:55 +0200 |
| commit | 344a453bb8905f7c6f8f05d54469955eed9b2818 (patch) | |
| tree | 16bc812a9cfdf62b9a496103e86e2707263941c6 /scene/resources | |
| parent | 1aa1398012b9132a26ffe6aa4cc9d4dde984b409 (diff) | |
| parent | dec20a987b40e7625b38e520cc223723da9bae2a (diff) | |
Merge pull request #22681 from akien-mga/fix-warnings
Fix warnings on release builds and some MSVC warnings
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/material.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/resources/material.h b/scene/resources/material.h index 0154874ae4..cf4d19b5a7 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -286,7 +286,7 @@ private: mk.key = 0; for (int i = 0; i < FEATURE_MAX; i++) { if (features[i]) { - mk.feature_mask |= (1 << i); + mk.feature_mask |= ((uint64_t)1 << i); } } mk.detail_uv = detail_uv; @@ -295,7 +295,7 @@ private: mk.cull_mode = cull_mode; for (int i = 0; i < FLAG_MAX; i++) { if (flags[i]) { - mk.flags |= (1 << i); + mk.flags |= ((uint64_t)1 << i); } } mk.detail_blend_mode = detail_blend_mode; |