asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #42170 from Razoric480/fix-vscript-value-by-type-32

Browse source 
Add a VScript func to sanitize variant values (3.2)
This commit is contained in:
Rémi Verschelde 2020-09-23 09:35:22 +02:00 committed by GitHub
commit 26512dda93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/visual_script/visual_script_editor.cpp
View file

@ -991,8 +991,8 @@ void VisualScriptEditor::_update_members() {
TreeItem *ti = members->create_item(variables);
ti->set_text(0, E->get());
Variant var = script->get_variable_default_value(E->get());
ti->set_suffix(0, "= " + String(var));
ti->set_suffix(0, "= " + _sanitized_variant_text(E->get()));
ti->set_icon(0, type_icons[script->get_variable_info(E->get()).type]);
ti->set_selectable(0, true);
@ -1032,6 +1032,18 @@ void VisualScriptEditor::_update_members() {
updating_members = false;
}
String VisualScriptEditor::_sanitized_variant_text(const StringName &property_name) {
Variant var = script->get_variable_default_value(property_name);
if (script->get_variable_info(property_name).type != Variant::NIL) {
Variant::CallError ce;
const Variant *converted = &var;
var = Variant::construct(script->get_variable_info(property_name).type, &converted, 1, ce, false);
}
return String(var);
}
void VisualScriptEditor::_member_selected() {
if (updating_members)

1
modules/visual_script/visual_script_editor.h
View file

@ -146,6 +146,7 @@ class VisualScriptEditor : public ScriptEditorBase {
bool updating_members;
void _update_members();
String _sanitized_variant_text(const StringName &property_name);
StringName selected;