godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18168 from Chaosus/fixcrash 

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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats 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) {
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();
}

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) {
if (!node) {
return;
}
switch (p_option) {
case MENU_OPTION_CREATE_MESH_2D: {
@ -389,6 +393,7 @@ SpriteEditorPlugin::SpriteEditorPlugin(EditorNode *p_node) {
editor = p_node;
sprite_editor = memnew(SpriteEditor);
editor->get_viewport()->add_child(sprite_editor);
make_visible(false);
//sprite_editor->options->hide();
}