diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 10:30:08 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 10:30:08 -0300 |
commit | 63033aa646f7a49fbcecbc8cc30077cf268be10c (patch) | |
tree | 80ccf1aed83e6c4d3ed1db2e1d2c0258090f7339 /core/ustring.cpp | |
parent | ab22203791489df160c36a29a3cd8aa8b32bec04 (diff) | |
parent | 0d2b28377f1257af039c088f30c11aa0d12cc695 (diff) | |
download | redot-engine-63033aa646f7a49fbcecbc8cc30077cf268be10c.tar.gz |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'core/ustring.cpp')
-rw-r--r-- | core/ustring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index e5419effcb..7582376fe0 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -3066,7 +3066,7 @@ String String::world_wrap(int p_chars_per_line) const { } else if (operator[](i)==' ' || operator[](i)=='\t') { last_space=i; } else if (operator[](i)=='\n') { - ret+=substr(from,i-from); + ret+=substr(from,i-from)+"\n"; from=i+1; last_space=-1; } |