diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 21:39:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 21:39:04 +0200 |
| commit | 40c3c8745df3d08065802762e236beeaa6aa1345 (patch) | |
| tree | 24307e256b9c6cd973e5332b4b5b1959f1a10419 /scene/resources | |
| parent | dea0f69296f248d3294bdf11bd77eba212ce7d6c (diff) | |
| parent | 2091f204432d58f20a642bf9fab83a6d08a65084 (diff) | |
Merge pull request #22516 from akien-mga/fix-warnings
Fix warnings about wrong member initialization order [-Wreorder]
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/tile_set.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h index 74dcd47c48..1802bf12b6 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/tile_set.h @@ -80,8 +80,8 @@ public: struct AutotileData { BitmaskMode bitmask_mode; - int spacing; Size2 size; + int spacing; Vector2 icon_coord; Map<Vector2, uint16_t> flags; Map<Vector2, Ref<OccluderPolygon2D> > occluder_map; @@ -90,11 +90,10 @@ public: // Default size to prevent invalid value explicit AutotileData() : + bitmask_mode(BITMASK_2X2), size(64, 64), spacing(0), - icon_coord(0, 0) { - bitmask_mode = BITMASK_2X2; - } + icon_coord(0, 0) {} }; private: @@ -111,8 +110,8 @@ private: Vector2 navigation_polygon_offset; Ref<NavigationPolygon> navigation_polygon; Ref<ShaderMaterial> material; - Color modulate; TileMode tile_mode; + Color modulate; AutotileData autotile_data; int z_index; |