diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 00:25:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-13 00:25:50 +0300 |
commit | 6844f7eb0cf5c7a5f83677ce92ca8f03b92c5b8a (patch) | |
tree | b56422b609e10a4d78c99dc34aae9cf260263227 /release | |
parent | 77a5250975620b38c51969d9875eded6dfb3bf98 (diff) | |
parent | 20d06eb3a85bc2930aef9a9d882d66905fb1fecf (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 5431ba6284f..92ac18e0f6f 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1445,10 +1445,10 @@ class WM_OT_appconfig_activate(Operator): def execute(self, context): import os - bpy.utils.keyconfig_set(self.filepath) - - filepath = self.filepath.replace("keyconfig", "interaction") - + filepath = self.filepath + bpy.utils.keyconfig_set(filepath) + dirname, filename = os.path.split(filepath) + filepath = os.path.normpath(os.path.join(dirname, os.pardir, "interaction", filename)) if os.path.exists(filepath): bpy.ops.script.execute_preset( filepath=filepath, |