godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-14 13:41:12 +00:00
Code Releases Wiki Activity

Merge pull request #18168 from Chaosus/fixcrash

Browse Source 
Fix possible crash when clicking on Skeleton2D or Sprite editor options
This commit is contained in:
Rémi Verschelde
2018-04-18 16:19:10 +02:00
committed by GitHub
parent 3da7263920 026617b5fb
commit db70538688
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
editor/plugins/skeleton_2d_editor_plugin.cpp
View File

@@ -20,6 +20,10 @@ void Skeleton2DEditor::edit(Skeleton2D *p_sprite) {
void Skeleton2DEditor::_menu_option(int p_option) { void Skeleton2DEditor::_menu_option(int p_option) {
if (!node) {
return;
}
switch (p_option) { switch (p_option) {
case MENU_OPTION_MAKE_REST: { case MENU_OPTION_MAKE_REST: {
@@ -107,6 +111,7 @@ Skeleton2DEditorPlugin::Skeleton2DEditorPlugin(EditorNode *p_node) {
editor = p_node; editor = p_node;
sprite_editor = memnew(Skeleton2DEditor); sprite_editor = memnew(Skeleton2DEditor);
editor->get_viewport()->add_child(sprite_editor); editor->get_viewport()->add_child(sprite_editor);
make_visible(false);
//sprite_editor->options->hide(); //sprite_editor->options->hide();
} }

5
editor/plugins/sprite_editor_plugin.cpp
View File

@@ -80,6 +80,10 @@ Vector<Vector2> expand(const Vector<Vector2> &points, const Rect2i &rect, float
void SpriteEditor::_menu_option(int p_option) { void SpriteEditor::_menu_option(int p_option) {
if (!node) {
return;
}
switch (p_option) { switch (p_option) {
case MENU_OPTION_CREATE_MESH_2D: { case MENU_OPTION_CREATE_MESH_2D: {
@@ -389,6 +393,7 @@ SpriteEditorPlugin::SpriteEditorPlugin(EditorNode *p_node) {
editor = p_node; editor = p_node;
sprite_editor = memnew(SpriteEditor); sprite_editor = memnew(SpriteEditor);
editor->get_viewport()->add_child(sprite_editor); editor->get_viewport()->add_child(sprite_editor);
make_visible(false);
//sprite_editor->options->hide(); //sprite_editor->options->hide();
} }