Skip to content

Commit

Permalink
Merge pull request #13240 from Krakean/fix_interpretcomma_as_decimalp…
Browse files Browse the repository at this point in the history
…oint

Makes possible to interpret comma as decimal point in editor
  • Loading branch information
akien-mga authored Nov 26, 2017
2 parents b620b3d + a410920 commit 03a2cf2
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions editor/property_editor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4621,21 +4621,24 @@ SectionedPropertyEditor::~SectionedPropertyEditor() {

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)
return _default_eval(p_text);
return _default_eval(p_new_text);

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();
if (err) {
print_line("[PropertyValueEvaluator] Error loading script for expression: " + p_text);
return _default_eval(p_text);
print_line("[PropertyValueEvaluator] Error loading script for expression: " + p_new_text);
return _default_eval(p_new_text);
}

Object dummy;
ScriptInstance *script_instance = script->instance_create(&dummy);
if (!script_instance)
return _default_eval(p_text);
return _default_eval(p_new_text);

Variant::CallError call_err;
Variant arg = obj;
Expand All @@ -4646,7 +4649,7 @@ double PropertyValueEvaluator::eval(const String &p_text) {
}
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) {
Expand Down

0 comments on commit 03a2cf2

Please sign in to comment.