diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-07-23 11:31:31 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-07-23 11:43:37 +0300 |
| commit | 8a5da947dc66beb8d11acc6222fd6ec38d0d5bd7 (patch) | |
| tree | 245b2fd3a630d6adcfe5196e22bf654ef843438a /release | |
| parent | 944df0c7842538002eb3c7399cfb628500d9a03d (diff) | |
Fix error in 'preferences.copy_prev' checking for the last version
The check to avoid updating between major releases prevented
2.90 files being copied to 2.91
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/userpref.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py index 2e14df1920f..e92f493960a 100644 --- a/release/scripts/startup/bl_operators/userpref.py +++ b/release/scripts/startup/bl_operators/userpref.py @@ -119,8 +119,11 @@ class PREFERENCES_OT_copy_prev(Operator): # Find config folder from previous version. import os version = bpy.app.version + version_new = ((version[0] * 100) + version[1]) version_old = ((version[0] * 100) + version[1]) - 1 - while version_old % 10 > 0: + # Ensure we only try to copy files from a point release. + # The check below ensures the second numbers match. + while (version_new % 100) // 10 == (version_old % 100) // 10: version_split = version_old // 100, version_old % 100 if os.path.isdir(cls._old_version_path(version_split)): return version_split |