feat: updated engine version to 4.4-rc1
This commit is contained in:
parent
ee00efde1f
commit
21ba8e33af
5459 changed files with 1128836 additions and 198305 deletions
|
|
@ -33,7 +33,6 @@
|
|||
#include "editor/editor_data.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_string_names.h"
|
||||
#include "editor/multi_node_edit.h"
|
||||
#include "editor/themes/editor_scale.h"
|
||||
#include "scene/gui/margin_container.h"
|
||||
|
||||
|
|
@ -103,7 +102,6 @@ void EditorObjectSelector::_show_popup() {
|
|||
sub_objects_menu->set_position(gp);
|
||||
sub_objects_menu->set_size(Size2(size.width, 1));
|
||||
|
||||
sub_objects_menu->take_mouse_focus();
|
||||
sub_objects_menu->popup();
|
||||
}
|
||||
|
||||
|
|
@ -129,12 +127,7 @@ void EditorObjectSelector::update_path() {
|
|||
continue;
|
||||
}
|
||||
|
||||
Ref<Texture2D> obj_icon;
|
||||
if (Object::cast_to<MultiNodeEdit>(obj)) {
|
||||
obj_icon = EditorNode::get_singleton()->get_class_icon(Object::cast_to<MultiNodeEdit>(obj)->get_edited_class_name());
|
||||
} else {
|
||||
obj_icon = EditorNode::get_singleton()->get_object_icon(obj);
|
||||
}
|
||||
Ref<Texture2D> obj_icon = EditorNode::get_singleton()->get_object_icon(obj);
|
||||
|
||||
if (obj_icon.is_valid()) {
|
||||
current_object_icon->set_texture(obj_icon);
|
||||
|
|
@ -216,9 +209,6 @@ void EditorObjectSelector::_notification(int p_what) {
|
|||
}
|
||||
}
|
||||
|
||||
void EditorObjectSelector::_bind_methods() {
|
||||
}
|
||||
|
||||
EditorObjectSelector::EditorObjectSelector(EditorSelectionHistory *p_history) {
|
||||
history = p_history;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue