Merge branch 'blender-v4.1-release'

2024-02-09 18:20:21 +11:00
parent 239f307eb4 bc5a8f33d8
commit 67e3704a45
2 changed files with 29 additions and 5 deletions
--- a/source/blender/blenloader/intern/versioning_userdef.cc
+++ b/source/blender/blenloader/intern/versioning_userdef.cc
@@ -915,6 +915,14 @@ void blo_do_versions_userdef(UserDef *userdef)
    userdef->keying_flag |= AUTOKEY_FLAG_INSERTNEEDED;
  }

+  if (!USER_VERSION_ATLEAST(401, 21)) {
+    LISTBASE_FOREACH (wmKeyMap *, km, &userdef->user_keymaps) {
+      if (STREQ(km->idname, "NLA Channels")) {
+        STRNCPY(km->idname, "NLA Tracks");
+      }
+    }
+  }
+
  /**
   * Always bump subversion in BKE_blender_version.h when adding versioning
   * code here, and wrap it inside a USER_VERSION_ATLEAST check.