From a7e4268beeda8e49cd93af375b125c72e6f2ac93 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 23 Mar 2018 17:31:33 +0100 Subject: UI: restore quit confirmation when dialog disabled --- source/blender/windowmanager/intern/wm_operators.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 1c21069879a..814d8823817 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2166,12 +2166,23 @@ static int wm_exit_blender_exec(bContext *C, wmOperator *UNUSED(op)) return OPERATOR_FINISHED; } +static int wm_exit_blender_invoke(bContext *C, wmOperator *op, const wmEvent *event) +{ + if (U.uiflag & USER_QUIT_PROMPT) { + return wm_exit_blender_exec(C, op); + } + else { + return WM_operator_confirm(C, op, event); + } +} + static void WM_OT_quit_blender(wmOperatorType *ot) { ot->name = "Quit Blender"; ot->idname = "WM_OT_quit_blender"; ot->description = "Quit Blender"; + ot->invoke = wm_exit_blender_invoke; ot->exec = wm_exit_blender_exec; } -- cgit v1.2.3 From 64e5f83133742c622e9c44b80f86d744a0dab05d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 26 Mar 2018 14:38:47 +0200 Subject: BLF: Don't use user preferences BLF is a low level module, which might (and is) used without Blender. Thanks Campbell for review! --- source/blender/windowmanager/intern/wm_files.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/windowmanager') diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 7df6deaecf6..e0b57effbe9 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -62,6 +62,8 @@ #include "BLT_translation.h" +#include "BLF_api.h" + #include "DNA_mesh_types.h" /* only for USE_BMESH_SAVE_AS_COMPAT */ #include "DNA_object_types.h" #include "DNA_space_types.h" @@ -339,6 +341,8 @@ static void wm_init_userdef(Main *bmain, const bool read_userdef_from_memory) /* update tempdir from user preferences */ BKE_tempdir_init(U.tempdir); + + BLF_antialias_set((U.text_render & USER_TEXT_DISABLE_AA) == 0); } -- cgit v1.2.3