diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-12-13 02:02:08 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-12-13 02:02:08 +0400 |
| commit | 9211fae41e294aefc980dd8fcb37ac9fed2efe1a (patch) | |
| tree | cb8f0ead0703c43acc8844b49858a725430b0e27 /source/blender/windowmanager/intern/wm_files.c | |
| parent | 160ebfa4c4b6b85b8266f8473160fa9bf4feb222 (diff) | |
Bugfix, irc report:
Crash on running in background mode. Calling GHOST function, but there is
no GHOST initialized. Easy to skip.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_files.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 0f983cbd568..6c16c968a81 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -304,8 +304,10 @@ static void wm_init_userdef(bContext *C) BLI_init_temporary_dir(U.tempdir); /* displays with larger native pixels, like Macbook. Used to scale dpi with */ - U.pixelsize = GHOST_GetNativePixelSize(); + if (G.background == FALSE) + U.pixelsize = GHOST_GetNativePixelSize(); if (U.pixelsize == 0) U.pixelsize = 1; + BKE_userdef_state(); } |