[Bf-blender-cvs] [37b155420b7] master: Merge branch 'blender-v2.91-release' into master

[Philipp Oeser]

Commit: 37b155420b7cba189e69f648728be967943c4ec0
Author: Philipp Oeser
Date:   Fri Nov 6 12:00:50 2020 +0100
Branches: master
https://developer.blender.org/rB37b155420b7cba189e69f648728be967943c4ec0

Merge branch 'blender-v2.91-release' into master

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/unit.c
index 4d287429558,73bf149bf2a..249a35a0af8
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@@ -815,8 -815,14 +815,14 @@@ static char *find_next_op(const char *s
  
        /* 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 (remaining_str[i - 1] == 'e' || remaining_str[i - 1] == 'E') {
 +        if (ELEM(remaining_str[i - 1], 'e', 'E')) {
            scientific_notation = true;
            continue;
          }