diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-20 07:13:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 07:13:54 +0100 |
| commit | 353e2071d06e5e4cfaaa5ce99e5f13ef7e689ddd (patch) | |
| tree | 6676592039e79b4f0fdd1b194c7e24c74ad8368c | |
| parent | 3afc47bbd68c3ae169ef8e0a051ee71226dca647 (diff) | |
| parent | a31bc1b0ba608ef340068676f6709621a37f2140 (diff) | |
Merge pull request #36340 from nathanwfranke/fix-signal-errors
Fix two signal errors, remove unused break_request signals in profilers
| -rw-r--r-- | core/object.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_visual_profiler.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | editor/script_editor_debugger.cpp | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/core/object.cpp b/core/object.cpp index 0a7a46a7d2..f0b708f047 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -917,7 +917,6 @@ Variant Object::call(const StringName &p_method, const Variant **p_args, int p_a MethodBind *method = ClassDB::get_method(get_class_name(), p_method); if (method) { - ret = method->call(this, p_args, p_argcount, r_error); } else { r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; diff --git a/editor/editor_visual_profiler.cpp b/editor/editor_visual_profiler.cpp index 579ac2e9ab..635d5302eb 100644 --- a/editor/editor_visual_profiler.cpp +++ b/editor/editor_visual_profiler.cpp @@ -588,8 +588,7 @@ void EditorVisualProfiler::_graph_tex_input(const Ref<InputEvent> &p_ev) { if (activate->is_pressed()) { if (!seeking) { - //probably not need to break request, can just stop profiling - //emit_signal("break_request"); + // Break request is not required, just stop profiling } } @@ -679,7 +678,6 @@ void EditorVisualProfiler::_bind_methods() { ClassDB::bind_method(D_METHOD("_item_selected"), &EditorVisualProfiler::_item_selected); ADD_SIGNAL(MethodInfo("enable_profiling", PropertyInfo(Variant::BOOL, "enable"))); - ADD_SIGNAL(MethodInfo("break_request")); } void EditorVisualProfiler::set_enabled(bool p_enable) { diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 3ab7fdb39c..c5f6a88783 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -5413,8 +5413,8 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { editor_selection->connect("selection_changed", this, "update"); editor_selection->connect("selection_changed", this, "_selection_changed"); - editor->call_deferred("connect", "play_pressed", this, "_update_override_camera_button", make_binds(true)); - editor->call_deferred("connect", "stop_pressed", this, "_update_override_camera_button", make_binds(false)); + editor->call_deferred("connect", make_binds("play_pressed", this, "_update_override_camera_button", true)); + editor->call_deferred("connect", make_binds("stop_pressed", this, "_update_override_camera_button", false)); hb = memnew(HBoxContainer); add_child(hb); diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index af740d9b4f..3d30ca410a 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -2508,7 +2508,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { visual_profiler->set_name(TTR("Visual Profiler")); tabs->add_child(visual_profiler); visual_profiler->connect("enable_profiling", this, "_visual_profiler_activate"); - visual_profiler->connect("break_request", this, "_profiler_seeked"); } { //network profiler @@ -2516,7 +2515,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { network_profiler->set_name(TTR("Network Profiler")); tabs->add_child(network_profiler); network_profiler->connect("enable_profiling", this, "_network_profiler_activate"); - network_profiler->connect("break_request", this, "_profiler_seeked"); } { //monitors |