godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Signals: Fix invalid connections to missing callbacks

Browse Source 
These bugs existed since those lines were added, so I assume that
their intended use is no longer relevant.
This commit is contained in:
Rémi Verschelde
2020-02-23 22:52:27 +01:00
parent 220c8e8344
commit 15e6a82faf
7 changed files with 4 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/groups_editor.cpp
View File

@@ -29,6 +29,7 @@
/*************************************************************************/ /*************************************************************************/
#include "groups_editor.h" #include "groups_editor.h"
#include "editor/scene_tree_editor.h" #include "editor/scene_tree_editor.h"
#include "editor_node.h" #include "editor_node.h"
#include "editor_scale.h" #include "editor_scale.h"
@@ -468,7 +469,6 @@ GroupDialog::GroupDialog() {
nodes_to_add->set_select_mode(Tree::SELECT_MULTI); nodes_to_add->set_select_mode(Tree::SELECT_MULTI);
nodes_to_add->set_v_size_flags(SIZE_EXPAND_FILL); nodes_to_add->set_v_size_flags(SIZE_EXPAND_FILL);
nodes_to_add->add_constant_override("draw_guides", 1); nodes_to_add->add_constant_override("draw_guides", 1);
nodes_to_add->connect_compat("item_selected", this, "_nodes_to_add_selected");
HBoxContainer *add_filter_hbc = memnew(HBoxContainer); HBoxContainer *add_filter_hbc = memnew(HBoxContainer);
add_filter_hbc->add_constant_override("separate", 0); add_filter_hbc->add_constant_override("separate", 0);
@@ -515,7 +515,6 @@ GroupDialog::GroupDialog() {
nodes_to_remove->set_hide_folding(true); nodes_to_remove->set_hide_folding(true);
nodes_to_remove->set_select_mode(Tree::SELECT_MULTI); nodes_to_remove->set_select_mode(Tree::SELECT_MULTI);
nodes_to_remove->add_constant_override("draw_guides", 1); nodes_to_remove->add_constant_override("draw_guides", 1);
nodes_to_remove->connect_compat("item_selected", this, "_node_to_remove_selected");
HBoxContainer *remove_filter_hbc = memnew(HBoxContainer); HBoxContainer *remove_filter_hbc = memnew(HBoxContainer);
remove_filter_hbc->add_constant_override("separate", 0); remove_filter_hbc->add_constant_override("separate", 0);

13
editor/plugins/animation_player_editor_plugin.cpp
View File

@@ -38,10 +38,8 @@
#include "editor/animation_track_editor.h" #include "editor/animation_track_editor.h"
#include "editor/editor_scale.h" #include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/plugins/canvas_item_editor_plugin.h" // For onion skinning.
// For onion skinning. #include "editor/plugins/spatial_editor_plugin.h" // For onion skinning.
#include "editor/plugins/canvas_item_editor_plugin.h"
#include "editor/plugins/spatial_editor_plugin.h"
#include "scene/main/viewport.h" #include "scene/main/viewport.h"
#include "servers/visual_server.h" #include "servers/visual_server.h"
@@ -375,8 +373,7 @@ void AnimationPlayerEditor::_animation_save_in_path(const Ref<Resource> &p_resou
Error err = ResourceSaver::save(path, p_resource, flg | ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS); Error err = ResourceSaver::save(path, p_resource, flg | ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS);
if (err != OK) { if (err != OK) {
accept->set_text(TTR("Error saving resource!")); EditorNode::get_singleton()->show_warning(TTR("Error saving resource!"));
accept->popup_centered_minsize();
return; return;
} }
@@ -1628,10 +1625,6 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor, AnimationPlay
scale->set_tooltip(TTR("Scale animation playback globally for the node.")); scale->set_tooltip(TTR("Scale animation playback globally for the node."));
scale->hide(); scale->hide();
accept = memnew(AcceptDialog);
add_child(accept);
accept->connect_compat("confirmed", this, "_menu_confirm_current");
delete_dialog = memnew(ConfirmationDialog); delete_dialog = memnew(ConfirmationDialog);
add_child(delete_dialog); add_child(delete_dialog);
delete_dialog->connect_compat("confirmed", this, "_animation_remove_confirmed"); delete_dialog->connect_compat("confirmed", this, "_animation_remove_confirmed");

1
editor/plugins/animation_player_editor_plugin.h
View File

@@ -110,7 +110,6 @@ class AnimationPlayerEditor : public VBoxContainer {
float timeline_position; float timeline_position;
EditorFileDialog *file; EditorFileDialog *file;
AcceptDialog *accept;
ConfirmationDialog *delete_dialog; ConfirmationDialog *delete_dialog;
int current_option; int current_option;

7
editor/plugins/cpu_particles_editor_plugin.cpp
View File

@@ -51,12 +51,6 @@ void CPUParticlesEditor::_menu_option(int p_option) {
switch (p_option) { switch (p_option) {
case MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_MESH: {
emission_file_dialog->popup_centered_ratio();
} break;
case MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE: { case MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE: {
emission_tree_dialog->popup_centered_ratio(); emission_tree_dialog->popup_centered_ratio();
@@ -112,7 +106,6 @@ CPUParticlesEditor::CPUParticlesEditor() {
particles_editor_hb->hide(); particles_editor_hb->hide();
options->set_text(TTR("CPUParticles")); options->set_text(TTR("CPUParticles"));
options->get_popup()->add_item(TTR("Create Emission Points From Mesh"), MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_MESH);
options->get_popup()->add_item(TTR("Create Emission Points From Node"), MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE); options->get_popup()->add_item(TTR("Create Emission Points From Node"), MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE);
options->get_popup()->add_separator(); options->get_popup()->add_separator();
options->get_popup()->add_item(TTR("Restart"), MENU_OPTION_RESTART); options->get_popup()->add_item(TTR("Restart"), MENU_OPTION_RESTART);

1
editor/plugins/cpu_particles_editor_plugin.h
View File

@@ -41,7 +41,6 @@ class CPUParticlesEditor : public ParticlesEditorBase {
enum Menu { enum Menu {
MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE, MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE,
MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_MESH,
MENU_OPTION_CLEAR_EMISSION_VOLUME, MENU_OPTION_CLEAR_EMISSION_VOLUME,
MENU_OPTION_RESTART MENU_OPTION_RESTART

26
editor/plugins/particles_editor_plugin.cpp
View File

@@ -231,23 +231,9 @@ ParticlesEditorBase::ParticlesEditorBase() {
emission_dialog->get_ok()->set_text(TTR("Create")); emission_dialog->get_ok()->set_text(TTR("Create"));
emission_dialog->connect_compat("confirmed", this, "_generate_emission_points"); emission_dialog->connect_compat("confirmed", this, "_generate_emission_points");
emission_file_dialog = memnew(EditorFileDialog);
add_child(emission_file_dialog);
emission_file_dialog->connect_compat("file_selected", this, "_resource_seleted");
emission_tree_dialog = memnew(SceneTreeDialog); emission_tree_dialog = memnew(SceneTreeDialog);
add_child(emission_tree_dialog); add_child(emission_tree_dialog);
emission_tree_dialog->connect_compat("selected", this, "_node_selected"); emission_tree_dialog->connect_compat("selected", this, "_node_selected");
List<String> extensions;
ResourceLoader::get_recognized_extensions_for_type("Mesh", &extensions);
emission_file_dialog->clear_filters();
for (int i = 0; i < extensions.size(); i++) {
emission_file_dialog->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
}
emission_file_dialog->set_mode(EditorFileDialog::MODE_OPEN_FILE);
} }
void ParticlesEditor::_node_removed(Node *p_node) { void ParticlesEditor::_node_removed(Node *p_node) {
@@ -279,17 +265,6 @@ void ParticlesEditor::_menu_option(int p_option) {
generate_seconds->set_value(trunc(gen_time) + 1.0); generate_seconds->set_value(trunc(gen_time) + 1.0);
generate_aabb->popup_centered_minsize(); generate_aabb->popup_centered_minsize();
} break; } break;
case MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_MESH: {
Ref<ParticlesMaterial> material = node->get_process_material();
if (material.is_null()) {
EditorNode::get_singleton()->show_warning(TTR("A processor material of type 'ParticlesMaterial' is required."));
return;
}
emission_file_dialog->popup_centered_ratio();
} break;
case MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE: { case MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE: {
Ref<ParticlesMaterial> material = node->get_process_material(); Ref<ParticlesMaterial> material = node->get_process_material();
if (material.is_null()) { if (material.is_null()) {
@@ -467,7 +442,6 @@ ParticlesEditor::ParticlesEditor() {
options->set_text(TTR("Particles")); options->set_text(TTR("Particles"));
options->get_popup()->add_item(TTR("Generate AABB"), MENU_OPTION_GENERATE_AABB); options->get_popup()->add_item(TTR("Generate AABB"), MENU_OPTION_GENERATE_AABB);
options->get_popup()->add_separator(); options->get_popup()->add_separator();
options->get_popup()->add_item(TTR("Create Emission Points From Mesh"), MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_MESH);
options->get_popup()->add_item(TTR("Create Emission Points From Node"), MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE); options->get_popup()->add_item(TTR("Create Emission Points From Node"), MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE);
options->get_popup()->add_separator(); options->get_popup()->add_separator();
options->get_popup()->add_item(TTR("Convert to CPUParticles"), MENU_OPTION_CONVERT_TO_CPU_PARTICLES); options->get_popup()->add_item(TTR("Convert to CPUParticles"), MENU_OPTION_CONVERT_TO_CPU_PARTICLES);

2
editor/plugins/particles_editor_plugin.h
View File

@@ -46,7 +46,6 @@ protected:
MenuButton *options; MenuButton *options;
HBoxContainer *particles_editor_hb; HBoxContainer *particles_editor_hb;
EditorFileDialog *emission_file_dialog;
SceneTreeDialog *emission_tree_dialog; SceneTreeDialog *emission_tree_dialog;
ConfirmationDialog *emission_dialog; ConfirmationDialog *emission_dialog;
@@ -77,7 +76,6 @@ class ParticlesEditor : public ParticlesEditorBase {
MENU_OPTION_GENERATE_AABB, MENU_OPTION_GENERATE_AABB,
MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE, MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_NODE,
MENU_OPTION_CREATE_EMISSION_VOLUME_FROM_MESH,
MENU_OPTION_CLEAR_EMISSION_VOLUME, MENU_OPTION_CLEAR_EMISSION_VOLUME,
MENU_OPTION_CONVERT_TO_CPU_PARTICLES, MENU_OPTION_CONVERT_TO_CPU_PARTICLES,
MENU_OPTION_RESTART, MENU_OPTION_RESTART,