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

Merge pull request #13240 from Krakean/fix_interpretcomma_as_decimalpoint

Browse source 
Makes possible to interpret comma as decimal point in editor
This commit is contained in:
Rémi Verschelde 2017-11-27 00:55:40 +01:00 committed by GitHub
commit 03a2cf2f94
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
editor/property_editor.cpp
View file

@ -4621,21 +4621,24 @@ SectionedPropertyEditor::~SectionedPropertyEditor() {
double PropertyValueEvaluator::eval(const String &p_text) { double PropertyValueEvaluator::eval(const String &p_text) {
// If range value contains a comma replace it with dot (issue #6028)
const String &p_new_text = p_text.replace(",", ".");
if (!obj || !script_language) if (!obj || !script_language)
return _default_eval(p_text); return _default_eval(p_new_text);
Ref<Script> script = Ref<Script>(script_language->create_script()); Ref<Script> script = Ref<Script>(script_language->create_script());
script->set_source_code(_build_script(p_text)); script->set_source_code(_build_script(p_new_text));
Error err = script->reload(); Error err = script->reload();
if (err) { if (err) {
print_line("[PropertyValueEvaluator] Error loading script for expression: " + p_text); print_line("[PropertyValueEvaluator] Error loading script for expression: " + p_new_text);
return _default_eval(p_text); return _default_eval(p_new_text);
} }
Object dummy; Object dummy;
ScriptInstance *script_instance = script->instance_create(&dummy); ScriptInstance *script_instance = script->instance_create(&dummy);
if (!script_instance) if (!script_instance)
return _default_eval(p_text); return _default_eval(p_new_text);
Variant::CallError call_err; Variant::CallError call_err;
Variant arg = obj; Variant arg = obj;
@ -4646,7 +4649,7 @@ double PropertyValueEvaluator::eval(const String &p_text) {
} }
print_line("[PropertyValueEvaluator]: Error eval! Error code: " + itos(call_err.error)); print_line("[PropertyValueEvaluator]: Error eval! Error code: " + itos(call_err.error));
return _default_eval(p_text); return _default_eval(p_new_text);
} }
void PropertyValueEvaluator::edit(Object *p_obj) { void PropertyValueEvaluator::edit(Object *p_obj) {