[Bf-blender-cvs] [1aa17169249] master: Merge branch 'blender-v2.81-release'

[Campbell Barton]

Commit: 1aa17169249458b26289367f9140ae5dfa8a8ead
Author: Campbell Barton
Date:   Fri Oct 25 21:50:48 2019 +1100
Branches: master
https://developer.blender.org/rB1aa17169249458b26289367f9140ae5dfa8a8ead

Merge branch 'blender-v2.81-release'

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



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

diff --cc source/blender/blenloader/intern/versioning_userdef.c
index e1ee020940e,8328893f524..53a6b8b08cd
--- a/source/blender/blenloader/intern/versioning_userdef.c
+++ b/source/blender/blenloader/intern/versioning_userdef.c
@@@ -637,10 -650,16 +650,20 @@@ void BLO_version_defaults_userpref_blen
      }
    }
  
+   if (!USER_VERSION_ATLEAST(281, 16)) {
+     BKE_keyconfig_pref_filter_items(userdef,
+                                     &((struct wmKeyConfigFilterItemParams){
+                                         .check_item = true,
+                                         .check_diff_item_add = true,
+                                     }),
+                                     keymap_item_has_invalid_wm_context_data_path,
+                                     NULL);
+   }
+ 
 +  if (!USER_VERSION_ATLEAST(282, 1)) {
 +    userdef->file_space_data.filter_id = U_default.file_space_data.filter_id;
 +  }
 +
    /**
     * Include next version bump.
     */