blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

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

This commit is contained in:
Philipp Oeser 2020-11-06 12:00:50 +01:00
parent 390a0d5624 e6739ed91d
commit 37b155420b
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/unit.c
View File

@ -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;