From 04cdf8d04040f080372c129e218004a56da210f2 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 9 Nov 2018 11:43:45 +1100 Subject: Keymap: skip loading the keymap preset in background mode Caused a crash on exit and isn't needed. --- release/scripts/modules/bpy/utils/__init__.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'release') diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py index eb1b93002a9..b76050395da 100644 --- a/release/scripts/modules/bpy/utils/__init__.py +++ b/release/scripts/modules/bpy/utils/__init__.py @@ -146,6 +146,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False): """ use_time = use_class_register_check = _bpy.app.debug_python use_user = not _is_factory_startup + is_background = _bpy.app.background if use_time: import time @@ -261,17 +262,20 @@ def load_scripts(reload_scripts=False, refresh_scripts=False): _addon_utils.reset_all(reload_scripts=reload_scripts) del _initialize - # Load the default key configuration. - filepath = preset_find("blender", "keyconfig") - if filepath: - keyconfig_set(filepath) + if not is_background: + # Load the default key configuration. + filepath = preset_find("blender", "keyconfig") + if filepath: + keyconfig_set(filepath) - # run the active integration preset - filepath = preset_find(_user_preferences.inputs.active_keyconfig, - "keyconfig") + # run the active integration preset + filepath = preset_find( + _user_preferences.inputs.active_keyconfig, + "keyconfig", + ) - if filepath: - keyconfig_set(filepath) + if filepath: + keyconfig_set(filepath) if reload_scripts: import gc -- cgit v1.2.3