Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2016-03-04 19:58:35 +0300
committerJulian Eisel <eiseljulian@gmail.com>2016-03-04 20:13:01 +0300
commitfe7bab13439fe6f0181f6661fbf7bb7ae18f5310 (patch)
treea7dc136840a96365445f6897897c1bf2f59b38a9 /source
parenta3de3a03c879ce03174fe9ff096a67805669a4ba (diff)
Fix changing virtual pixelsize having no affect if only main window is open
Changing virtual pixelsize only had an affect when a second window was open. (Was also possible to trigger update by opening another window.) Steps to reproduce: * Change any editor into user preferences *in main window* * Change virtual pixel size -> nothing happens
Diffstat (limited to 'source')
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c3
-rw-r--r--source/blender/windowmanager/intern/wm_window.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index f4c6fdf42f5..657a8a3f514 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -148,8 +148,7 @@ static void rna_userdef_virtual_pixel_update(Main *UNUSED(bmain), Scene *UNUSED(
{
/* font's are stored at each DPI level, without this we can easy load 100's of fonts */
BLF_cache_clear();
-
- BKE_userdef_state();
+
WM_main_add_notifier(NC_WINDOW, NULL); /* full redraw */
WM_main_add_notifier(NC_SCREEN | NA_EDITED, NULL); /* refresh region sizes */
}
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index 688be21cdd0..572fbac080d 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -831,11 +831,11 @@ void wm_window_make_drawable(wmWindowManager *wm, wmWindow *win)
printf("%s: set drawable %d\n", __func__, win->winid);
}
GHOST_ActivateWindowDrawingContext(win->ghostwin);
-
- /* this can change per window */
- U.pixelsize = wm_window_pixelsize(win);
- BKE_userdef_state();
}
+
+ /* this can change per window */
+ U.pixelsize = wm_window_pixelsize(win);
+ BKE_userdef_state();
}
/* called by ghost, here we handle events for windows themselves or send to event system */