Merge branch 'blender-v2.90-release'

2020-07-26 22:00:13 +10:00 · 2020-07-26 22:00:13 +10:00 · 5414ccbd4c
parent 850234c1b1 28b1c70895
commit 5414ccbd4c
1 changed files with 3 additions and 3 deletions
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@ -3062,9 +3062,9 @@ void BKE_object_dimensions_set_ex(Object *ob,
          }
        }

-        if (len[i] > 0.0f) {
-
-          ob->scale[i] = copysignf(value[i] / len[i], ob->scale[i]);
+        const float scale = copysignf(value[i] / len[i], ob->scale[i]);
+        if (isfinite(scale)) {
+          ob->scale[i] = scale;
        }
      }
    }