diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | core/variant_parser.cpp | 4 | ||||
| -rw-r--r-- | editor/debugger/script_editor_debugger.cpp | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 503214bab9..80191423c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,7 +125,7 @@ before_install: install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then - pyenv global 3.7.5 system; + pyenv global 3.8 system; pip3 install --user scons; fi - scons --version diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index 44bf90674b..56d33c10f4 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -1110,6 +1110,10 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, value = token.value; return OK; + } else if (token.type == TK_STRING_NAME) { + + value = token.value; + return OK; } else if (token.type == TK_COLOR) { value = token.value; diff --git a/editor/debugger/script_editor_debugger.cpp b/editor/debugger/script_editor_debugger.cpp index 8feb1ee03a..45af70f191 100644 --- a/editor/debugger/script_editor_debugger.cpp +++ b/editor/debugger/script_editor_debugger.cpp @@ -1698,7 +1698,6 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { visual_profiler->set_name(TTR("Visual Profiler")); tabs->add_child(visual_profiler); visual_profiler->connect_compat("enable_profiling", this, "_visual_profiler_activate"); - visual_profiler->connect_compat("break_request", this, "_profiler_seeked"); } { //network profiler |