summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2017-11-27 00:55:40 +0100
committerGitHub <noreply@github.com>2017-11-27 00:55:40 +0100
commit03a2cf2f944db07b9a4413aa44d80b756f517726 (patch)
tree9d9ededf0e6bfc3dbaf6862b39878d8ba112a565
parentb620b3d697e67f7fa50f8d5bcbbfef3320dcb70a (diff)
parenta4109200aae678263e9a5e6d578b38dddcd09630 (diff)
Merge pull request #13240 from Krakean/fix_interpretcomma_as_decimalpoint
Makes possible to interpret comma as decimal point in editor
-rw-r--r--editor/property_editor.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp
index 73a5049916..d383e54f05 100644
--- a/editor/property_editor.cpp
+++ b/editor/property_editor.cpp
@@ -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;
@@ -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) {