Skip to content

Commit 177be9b

Browse files
KoBeWiYuriSizov
authored andcommitted
Initialize editor values on first launch
(cherry picked from commit b0eadcf)
1 parent 967ad04 commit 177be9b

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

editor/plugins/canvas_item_editor_plugin.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5407,6 +5407,7 @@ CanvasItemEditor::CanvasItemEditor() {
54075407
singleton = this;
54085408

54095409
set_process_shortcut_input(true);
5410+
clear(); // Make sure values are initialized.
54105411

54115412
// Update the menus' checkboxes.
54125413
callable_mp(this, &CanvasItemEditor::set_state).bind(get_state()).call_deferred();

editor/plugins/node_3d_editor_plugin.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7866,7 +7866,10 @@ void Node3DEditor::clear() {
78667866
viewports[i]->reset();
78677867
}
78687868

7869-
RenderingServer::get_singleton()->instance_set_visible(origin_instance, true);
7869+
if (origin_instance.is_valid()) {
7870+
RenderingServer::get_singleton()->instance_set_visible(origin_instance, true);
7871+
}
7872+
78707873
view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(MENU_VIEW_ORIGIN), true);
78717874
for (int i = 0; i < 3; ++i) {
78727875
if (grid_enable[i]) {
@@ -8654,6 +8657,7 @@ void fragment() {
86548657
_load_default_preview_settings();
86558658
_preview_settings_changed();
86568659
}
8660+
clear(); // Make sure values are initialized.
86578661
}
86588662
Node3DEditor::~Node3DEditor() {
86598663
memdelete(preview_node);

0 commit comments

Comments
 (0)