diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-18 16:19:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 16:19:10 +0200 |
| commit | db705386883eb656e9b51ff3437573f76c8aa6f3 (patch) | |
| tree | e492bdc17baccad1660078be9c549c5d1a902a99 /editor/plugins/skeleton_2d_editor_plugin.cpp | |
| parent | 3da72639202fd2f95ed1e539712c678c0a096ca1 (diff) | |
| parent | 026617b5fbc57e2494cb6f586917856e1cbf99c8 (diff) | |
Merge pull request #18168 from Chaosus/fixcrash
Fix possible crash when clicking on Skeleton2D or Sprite editor options
Diffstat (limited to 'editor/plugins/skeleton_2d_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/skeleton_2d_editor_plugin.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/editor/plugins/skeleton_2d_editor_plugin.cpp b/editor/plugins/skeleton_2d_editor_plugin.cpp index 6bf94b95eb..e372f792d6 100644 --- a/editor/plugins/skeleton_2d_editor_plugin.cpp +++ b/editor/plugins/skeleton_2d_editor_plugin.cpp @@ -20,6 +20,10 @@ void Skeleton2DEditor::edit(Skeleton2D *p_sprite) { void Skeleton2DEditor::_menu_option(int p_option) { + if (!node) { + return; + } + switch (p_option) { case MENU_OPTION_MAKE_REST: { @@ -107,6 +111,7 @@ Skeleton2DEditorPlugin::Skeleton2DEditorPlugin(EditorNode *p_node) { editor = p_node; sprite_editor = memnew(Skeleton2DEditor); editor->get_viewport()->add_child(sprite_editor); + make_visible(false); //sprite_editor->options->hide(); } |