diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-19 23:56:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-19 23:56:16 +0100 |
| commit | ad5ac052a447f5121e96f2c3964e14a880b397a7 (patch) | |
| tree | aac4eb9a616821320ceb41bb2d4ebc2cf04155f5 /editor | |
| parent | 1602e0cdb9b4f41faba330537f97f8ed8f381b80 (diff) | |
| parent | 4bfb504c2f047660ce85fda96657d5cb27415f19 (diff) | |
Merge pull request #16098 from NathanWarden/ci_command_options
Added --quit and --build-solutions cmd line options to make CI pipelines possible
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 6 | ||||
| -rw-r--r-- | editor/editor_node.h | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 29912feb1f..6d94aedfa9 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -1784,7 +1784,7 @@ void EditorNode::_run(bool p_current, const String &p_custom) { editor_data.save_editor_external_data(); } - if (!_call_build()) + if (!call_build()) return; if (bool(EDITOR_DEF("run/output/always_clear_output_on_play", true))) { @@ -2321,7 +2321,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { if (run_native->is_deploy_debug_remote_enabled()) { _menu_option_confirm(RUN_STOP, true); - if (!_call_build()) + if (!call_build()) break; // build failed emit_signal("play_pressed"); @@ -4525,7 +4525,7 @@ void EditorNode::add_build_callback(EditorBuildCallback p_callback) { EditorBuildCallback EditorNode::build_callbacks[EditorNode::MAX_BUILD_CALLBACKS]; -bool EditorNode::_call_build() { +bool EditorNode::call_build() { for (int i = 0; i < build_callback_count; i++) { if (!build_callbacks[i]()) diff --git a/editor/editor_node.h b/editor/editor_node.h index 403b09a919..6d96c2dea7 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -596,7 +596,6 @@ private: static EditorPluginInitializeCallback plugin_init_callbacks[MAX_INIT_CALLBACKS]; void _save_default_environment(); - bool _call_build(); static int build_callback_count; static EditorBuildCallback build_callbacks[MAX_BUILD_CALLBACKS]; @@ -634,6 +633,8 @@ protected: static void _bind_methods(); public: + bool call_build(); + static void add_plugin_init_callback(EditorPluginInitializeCallback p_callback); enum EditorTable { |