Merge pull request #36340 from nathanwfranke/fix-signal-errors
Fix two signal errors, remove unused break_request signals in profilers
This commit is contained in:
commit
353e2071d0
|
@ -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);
|
MethodBind *method = ClassDB::get_method(get_class_name(), p_method);
|
||||||
|
|
||||||
if (method) {
|
if (method) {
|
||||||
|
|
||||||
ret = method->call(this, p_args, p_argcount, r_error);
|
ret = method->call(this, p_args, p_argcount, r_error);
|
||||||
} else {
|
} else {
|
||||||
r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
|
r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD;
|
||||||
|
|
|
@ -588,8 +588,7 @@ void EditorVisualProfiler::_graph_tex_input(const Ref<InputEvent> &p_ev) {
|
||||||
|
|
||||||
if (activate->is_pressed()) {
|
if (activate->is_pressed()) {
|
||||||
if (!seeking) {
|
if (!seeking) {
|
||||||
//probably not need to break request, can just stop profiling
|
// Break request is not required, just stop profiling
|
||||||
//emit_signal("break_request");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -679,7 +678,6 @@ void EditorVisualProfiler::_bind_methods() {
|
||||||
|
|
||||||
ClassDB::bind_method(D_METHOD("_item_selected"), &EditorVisualProfiler::_item_selected);
|
ClassDB::bind_method(D_METHOD("_item_selected"), &EditorVisualProfiler::_item_selected);
|
||||||
ADD_SIGNAL(MethodInfo("enable_profiling", PropertyInfo(Variant::BOOL, "enable")));
|
ADD_SIGNAL(MethodInfo("enable_profiling", PropertyInfo(Variant::BOOL, "enable")));
|
||||||
ADD_SIGNAL(MethodInfo("break_request"));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void EditorVisualProfiler::set_enabled(bool p_enable) {
|
void EditorVisualProfiler::set_enabled(bool p_enable) {
|
||||||
|
|
|
@ -5413,8 +5413,8 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
|
||||||
editor_selection->connect("selection_changed", this, "update");
|
editor_selection->connect("selection_changed", this, "update");
|
||||||
editor_selection->connect("selection_changed", this, "_selection_changed");
|
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", make_binds("play_pressed", this, "_update_override_camera_button", true));
|
||||||
editor->call_deferred("connect", "stop_pressed", this, "_update_override_camera_button", make_binds(false));
|
editor->call_deferred("connect", make_binds("stop_pressed", this, "_update_override_camera_button", false));
|
||||||
|
|
||||||
hb = memnew(HBoxContainer);
|
hb = memnew(HBoxContainer);
|
||||||
add_child(hb);
|
add_child(hb);
|
||||||
|
|
|
@ -2508,7 +2508,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
|
||||||
visual_profiler->set_name(TTR("Visual Profiler"));
|
visual_profiler->set_name(TTR("Visual Profiler"));
|
||||||
tabs->add_child(visual_profiler);
|
tabs->add_child(visual_profiler);
|
||||||
visual_profiler->connect("enable_profiling", this, "_visual_profiler_activate");
|
visual_profiler->connect("enable_profiling", this, "_visual_profiler_activate");
|
||||||
visual_profiler->connect("break_request", this, "_profiler_seeked");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{ //network profiler
|
{ //network profiler
|
||||||
|
@ -2516,7 +2515,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) {
|
||||||
network_profiler->set_name(TTR("Network Profiler"));
|
network_profiler->set_name(TTR("Network Profiler"));
|
||||||
tabs->add_child(network_profiler);
|
tabs->add_child(network_profiler);
|
||||||
network_profiler->connect("enable_profiling", this, "_network_profiler_activate");
|
network_profiler->connect("enable_profiling", this, "_network_profiler_activate");
|
||||||
network_profiler->connect("break_request", this, "_profiler_seeked");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
{ //monitors
|
{ //monitors
|
||||||
|
|
Loading…
Reference in a new issue