diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 04:05:49 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-01-13 04:05:49 +0300 |
| commit | cdc31c3e6e953b8e10c757db113b7a60f701e1dd (patch) | |
| tree | 6bb85293faf6b7ab7ad7e8d169106584590fbc94 /source/blender/blenkernel/intern/blender.c | |
| parent | 49d51a1e6246f00233abf54a8b24b5d829848e44 (diff) | |
| parent | 40dbf2fc0000f2905d436fc28b93a9b97431f72d (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index d03be79baad..27d38fcfb37 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -285,8 +285,10 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use DATA_SWAP(keyconfigstr); DATA_SWAP(manipulator_flag); + DATA_SWAP(app_flag); - FLAG_SWAP(uiflag, int, USER_LOCK_UI_LAYOUT); + /* We could add others. */ + FLAG_SWAP(uiflag, int, USER_QUIT_PROMPT); #undef SWAP_TYPELESS #undef DATA_SWAP |