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

Fix mid-air conflict between #55299 and #55692

This commit is contained in:
Rémi Verschelde 2021-12-09 11:17:16 +01:00
parent 41e5f9227c
commit 3752e8f52e
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/plugins/material_editor_plugin.cpp
View File

@ -125,7 +125,7 @@ MaterialEditor::MaterialEditor() {
// canvas item // canvas item
layout_2d = memnew(HBoxContainer); layout_2d = memnew(HBoxContainer);
layout_2d->set_alignment(BoxContainer::ALIGN_CENTER); layout_2d->set_alignment(ALIGNMENT_CENTER);
add_child(layout_2d); add_child(layout_2d);
layout_2d->set_anchors_and_offsets_preset(PRESET_WIDE); layout_2d->set_anchors_and_offsets_preset(PRESET_WIDE);