diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-11-06 14:00:50 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-11-06 14:00:50 +0300 |
commit | 37b155420b7cba189e69f648728be967943c4ec0 (patch) | |
tree | fcc98eb2f24cc9915af0df61e5719165ca3d0e1e | |
parent | 390a0d562474134b3978aeb11535ea33ca8afb0e (diff) | |
parent | e6739ed91d5c4f34f6fbac88734ee1ba71bc6b6f (diff) |
Merge branch 'blender-v2.91-release' into master
-rw-r--r-- | source/blender/blenkernel/intern/unit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index 4d287429558..249a35a0af8 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -815,6 +815,12 @@ static char *find_next_op(const char *str, char *remaining_str, int len_max) /* Make sure we don't look backwards before the start of the string. */ if (remaining_str != str && i != 0) { + /* Check for velocity or acceleration (e.g. '/' in 'ft/s' is not an op). */ + if ((remaining_str[i] == '/') && ELEM(remaining_str[i - 1], 't', 'T', 'm', 'M') && + ELEM(remaining_str[i + 1], 's', 'S')) { + continue; + } + /* Check for scientific notation. */ if (ELEM(remaining_str[i - 1], 'e', 'E')) { scientific_notation = true; |