diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2021-11-09 12:34:41 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2021-11-09 12:34:41 +0300 |
| commit | b65df10346f5fe47c881b183901e2d7eff775848 (patch) | |
| tree | 95120de32f77d7193edc3687f0b97a0692288e8b /source/blender/blenkernel/intern/blender.c | |
| parent | 8bf8db8ca2dd534ce4aaa32a0921b599f36098c4 (diff) | |
| parent | a7540f4b3611a0d06f197e6f27148319927188f7 (diff) | |
Merge branch 'master' into tmp-vulkan
Diffstat (limited to 'source/blender/blenkernel/intern/blender.c')
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index e84b485c466..fb65a9bec7e 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -90,7 +90,6 @@ void BKE_blender_free(void) IMB_exit(); BKE_cachefiles_exit(); - BKE_images_exit(); DEG_free_node_types(); BKE_brush_system_exit(); @@ -127,7 +126,7 @@ static void blender_version_init(void) version_cycle = ""; } else { - BLI_assert(!"Invalid Blender version cycle"); + BLI_assert_msg(0, "Invalid Blender version cycle"); } BLI_snprintf(blender_version_string, @@ -362,7 +361,9 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use DATA_SWAP(app_flag); /* We could add others. */ - FLAG_SWAP(uiflag, int, USER_SAVE_PROMPT); + FLAG_SWAP(uiflag, int, USER_SAVE_PROMPT | USER_SPLASH_DISABLE | USER_SHOW_GIZMO_NAVIGATE); + + DATA_SWAP(ui_scale); #undef SWAP_TYPELESS #undef DATA_SWAP |