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

Merge pull request #34113 from timothyqiu/clear-guides 

Fixes crash when clearing guides in empty scene
This commit is contained in:
Rémi Verschelde 2019-12-05 10:00:38 +01:00 committed by GitHub
parent fbfd56c247 e8838f4385
commit 0192f7712c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -4752,19 +4752,21 @@ void CanvasItemEditor::_popup_callback(int p_op) {
} break; } break;
case CLEAR_GUIDES: { case CLEAR_GUIDES: {
if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_") || EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) { Node *const root = EditorNode::get_singleton()->get_edited_scene();
if (root && (root->has_meta("_edit_horizontal_guides_") || root->has_meta("_edit_vertical_guides_"))) {
undo_redo->create_action(TTR("Clear Guides")); undo_redo->create_action(TTR("Clear Guides"));
if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_horizontal_guides_")) { if (root->has_meta("_edit_horizontal_guides_")) {
Array hguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_horizontal_guides_"); Array hguides = root->get_meta("_edit_horizontal_guides_");
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", Array()); undo_redo->add_do_method(root, "set_meta", "_edit_horizontal_guides_", Array());
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_horizontal_guides_", hguides); undo_redo->add_undo_method(root, "set_meta", "_edit_horizontal_guides_", hguides);
} }
if (EditorNode::get_singleton()->get_edited_scene()->has_meta("_edit_vertical_guides_")) { if (root->has_meta("_edit_vertical_guides_")) {
Array vguides = EditorNode::get_singleton()->get_edited_scene()->get_meta("_edit_vertical_guides_"); Array vguides = root->get_meta("_edit_vertical_guides_");
undo_redo->add_do_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", Array()); undo_redo->add_do_method(root, "set_meta", "_edit_vertical_guides_", Array());
undo_redo->add_undo_method(EditorNode::get_singleton()->get_edited_scene(), "set_meta", "_edit_vertical_guides_", vguides); undo_redo->add_undo_method(root, "set_meta", "_edit_vertical_guides_", vguides);
} }
undo_redo->add_undo_method(viewport, "update"); undo_redo->add_undo_method(viewport, "update");
undo_redo->commit_action(); undo_redo->commit_action();