feat: updated godot version
This commit is contained in:
parent
0c508b0831
commit
42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
|
|
@ -34,15 +34,11 @@
|
|||
#include "core/extension/gdextension_manager.h"
|
||||
#include "core/io/file_access.h"
|
||||
#include "core/io/resource_loader.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "core/os/time.h"
|
||||
#include "editor/editor_node.h"
|
||||
#include "editor/editor_undo_redo_manager.h"
|
||||
#include "editor/inspector/editor_context_menu_plugin.h"
|
||||
#include "editor/inspector/multi_node_edit.h"
|
||||
#include "editor/plugins/editor_plugin.h"
|
||||
#include "scene/main/scene_tree.h"
|
||||
#include "scene/property_utils.h"
|
||||
#include "scene/resources/packed_scene.h"
|
||||
|
||||
|
|
@ -271,9 +267,9 @@ EditorPlugin *EditorData::get_handling_main_editor(Object *p_object) {
|
|||
|
||||
Vector<EditorPlugin *> EditorData::get_handling_sub_editors(Object *p_object) {
|
||||
Vector<EditorPlugin *> sub_plugins;
|
||||
for (EditorPlugin *plugin : editor_plugins) {
|
||||
if (!plugin->has_main_screen() && plugin->handles(p_object)) {
|
||||
sub_plugins.push_back(plugin);
|
||||
for (int i = editor_plugins.size() - 1; i > -1; i--) {
|
||||
if (!editor_plugins[i]->has_main_screen() && editor_plugins[i]->handles(p_object)) {
|
||||
sub_plugins.push_back(editor_plugins[i]);
|
||||
}
|
||||
}
|
||||
return sub_plugins;
|
||||
|
|
@ -621,7 +617,6 @@ int EditorData::add_edited_scene(int p_at_pos) {
|
|||
es.history_current = -1;
|
||||
es.live_edit_root = NodePath(String("/root"));
|
||||
es.history_id = last_created_scene++;
|
||||
es.time_opened = Time::get_singleton()->get_unix_time_from_system();
|
||||
|
||||
if (p_at_pos == edited_scene.size()) {
|
||||
edited_scene.push_back(es);
|
||||
|
|
@ -821,11 +816,6 @@ Vector<EditorData::EditedScene> EditorData::get_edited_scenes() const {
|
|||
return out_edited_scenes_list;
|
||||
}
|
||||
|
||||
uint64_t EditorData::get_scene_time_opened(int p_idx) const {
|
||||
ERR_FAIL_INDEX_V(p_idx, edited_scene.size(), 0);
|
||||
return edited_scene[p_idx].time_opened;
|
||||
}
|
||||
|
||||
void EditorData::set_scene_modified_time(int p_idx, uint64_t p_time) {
|
||||
if (p_idx == -1) {
|
||||
p_idx = current_edited_scene;
|
||||
|
|
@ -1332,20 +1322,16 @@ void EditorSelection::_update_node_list() {
|
|||
node_list_changed = false;
|
||||
}
|
||||
|
||||
void EditorSelection::update(bool p_deferred) {
|
||||
void EditorSelection::update() {
|
||||
_update_node_list();
|
||||
|
||||
if (!changed) {
|
||||
return;
|
||||
}
|
||||
changed = false;
|
||||
if (p_deferred) {
|
||||
if (!emitted) {
|
||||
emitted = true;
|
||||
callable_mp(this, &EditorSelection::_emit_change).call_deferred();
|
||||
}
|
||||
} else {
|
||||
_emit_change();
|
||||
if (!emitted) {
|
||||
emitted = true;
|
||||
callable_mp(this, &EditorSelection::_emit_change).call_deferred();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue