godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #56352 from Gallilus/Include-base-signals-to-VisualScriptEmitSignal

This commit is contained in:
Rémi Verschelde 2022-01-05 11:02:10 +01:00 committed by GitHub
parent e9c50c9c50 6a2a9d2267
commit 2c7fcdd7f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/visual_script/visual_script_func_nodes.cpp
View File

@ -2316,10 +2316,12 @@ void VisualScriptEmitSignal::_validate_property(PropertyInfo &property) const {
property.hint = PROPERTY_HINT_ENUM;
List<StringName> sigs;
List<MethodInfo> base_sigs;
Ref<VisualScript> vs = get_visual_script();
if (vs.is_valid()) {
vs->get_custom_signal_list(&sigs);
ClassDB::get_signal_list(vs->get_instance_base_type(), &base_sigs);
}
String ml;
@ -2329,6 +2331,12 @@ void VisualScriptEmitSignal::_validate_property(PropertyInfo &property) const {
}
ml += E;
}
for (const MethodInfo &E : base_sigs) {
if (!ml.is_empty()) {
ml += ",";
}
ml += E.name;
}
property.hint_string = ml;
}