diff options
Diffstat (limited to 'editor/editor_node.h')
| -rw-r--r-- | editor/editor_node.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/editor/editor_node.h b/editor/editor_node.h index 9d251690d2..dfe3d91c07 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -32,6 +32,7 @@ #define EDITOR_NODE_H #include "editor/editor_data.h" +#include "editor/editor_export.h" #include "editor/editor_folding.h" #include "editor/editor_run.h" #include "editor/inspector_dock.h" @@ -88,7 +89,6 @@ class Window; class SubViewport; class EditorNode : public Node { - GDCLASS(EditorNode, Node); public: @@ -152,7 +152,7 @@ private: FILE_EXTERNAL_OPEN_SCENE, EDIT_UNDO, EDIT_REDO, - EDIT_REVERT, + EDIT_RELOAD_SAVED_SCENE, TOOLS_ORPHAN_RESOURCES, TOOLS_CUSTOM, RESOURCE_SAVE, @@ -161,7 +161,6 @@ private: RUN_STOP, RUN_PLAY_SCENE, - RUN_PLAY_NATIVE, RUN_PLAY_CUSTOM_SCENE, RUN_SCENE_SETTINGS, RUN_SETTINGS, @@ -194,7 +193,8 @@ private: HELP_SEARCH, HELP_DOCS, HELP_QA, - HELP_ISSUES, + HELP_REPORT_A_BUG, + HELP_SEND_DOCS_FEEDBACK, HELP_COMMUNITY, HELP_ABOUT, @@ -491,6 +491,7 @@ private: void _quick_run(); void _run(bool p_current = false, const String &p_custom = ""); + void _run_native(const Ref<EditorExportPreset> &p_preset); void _save_optimized(); void _import_action(const String &p_action); @@ -546,8 +547,9 @@ private: static void _dependency_error_report(void *ud, const String &p_path, const String &p_dep, const String &p_type) { EditorNode *en = (EditorNode *)ud; - if (!en->dependency_errors.has(p_path)) + if (!en->dependency_errors.has(p_path)) { en->dependency_errors[p_path] = Set<String>(); + } en->dependency_errors[p_path].insert(p_dep + "::" + p_type); } @@ -800,10 +802,11 @@ public: static void progress_end_task_bg(const String &p_task); void save_scene_to_path(String p_file, bool p_with_preview = true) { - if (p_with_preview) + if (p_with_preview) { _save_scene_with_preview(p_file); - else + } else { _save_scene(p_file); + } } bool is_scene_in_use(const String &p_path); @@ -866,7 +869,6 @@ public: }; struct EditorProgress { - String task; bool step(const String &p_state, int p_step = -1, bool p_force_refresh = true) { return EditorNode::progress_task_step(task, p_state, p_step, p_force_refresh); } EditorProgress(const String &p_task, const String &p_label, int p_amount, bool p_can_cancel = false) { @@ -907,7 +909,6 @@ public: }; struct EditorProgressBG { - String task; void step(int p_step = -1) { EditorNode::progress_task_step_bg(task, p_step); } EditorProgressBG(const String &p_task, const String &p_label, int p_amount) { |