diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-29 23:40:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-29 23:40:08 +0200 |
| commit | b4aba3ae7c89b7d236d3efab459fb89b33c91a3c (patch) | |
| tree | e9af0a7cc2ff9798a645157b6a7fb45f8a88ba2a /editor/plugins | |
| parent | 9ca1a5af3e8186c396e5b8c74b2cebe1e25a65c9 (diff) | |
| parent | 9f0c6a60095025cb7f67a36ffa81e8709d645a66 (diff) | |
Merge pull request #30177 from hbina/use_FALLTHROUGH_macro
Applied some of FALLTHROUGH macro usage from #30122
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/sprite_frames_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | editor/plugins/tile_map_editor_plugin.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index c509202a88..d91de6cbf6 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -232,7 +232,8 @@ void SpriteFramesEditor::_notification(int p_what) { _delete->set_icon(get_icon("Remove", "EditorIcons")); new_anim->set_icon(get_icon("New", "EditorIcons")); remove_anim->set_icon(get_icon("Remove", "EditorIcons")); - } // Fallthrough. + FALLTHROUGH; + } case NOTIFICATION_THEME_CHANGED: { splite_sheet_scroll->add_style_override("bg", get_stylebox("bg", "Tree")); } break; diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index 82e8248216..6e47d82847 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -61,8 +61,8 @@ void TileMapEditor::_notification(int p_what) { if (is_visible_in_tree()) { _update_palette(); } - - } // fallthrough + FALLTHROUGH; + } case NOTIFICATION_ENTER_TREE: { |