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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-18 03:49:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-18 03:49:03 +0300
commit0f1a63d34c048b11f93b167449741540901feb01 (patch)
treeca8c4ec578b1d7c3b38fa28c1c8620b4fa449920 /release/scripts/modules/bpy_extras
parentf520f01b46b96467d1533a5614b39600e4de0b25 (diff)
PyAPI: add bpy.utils.execfile
Wraps `importlib.util`, avoids duplicate preset loading calls.
Diffstat (limited to 'release/scripts/modules/bpy_extras')
-rw-r--r--release/scripts/modules/bpy_extras/keyconfig_utils.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py
index 4d5ec5286ec..eb727167d33 100644
--- a/release/scripts/modules/bpy_extras/keyconfig_utils.py
+++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py
@@ -511,7 +511,7 @@ def keyconfig_import_from_data(name, keyconfig_data):
def keyconfig_module_from_preset(name, preset_reference_filename=None):
import os
- import importlib.util
+ import bpy
if preset_reference_filename is not None:
preset_path = os.path.join(os.path.dirname(preset_reference_filename), name + ".py")
else:
@@ -521,11 +521,7 @@ def keyconfig_module_from_preset(name, preset_reference_filename=None):
if not (preset_path and os.path.exists(preset_path)):
preset_path = bpy.utils.preset_find(name, "keyconfig")
- # module name isn't used or added to 'sys.modules'.
- mod_spec = importlib.util.spec_from_file_location("__main__", preset_path)
- mod = importlib.util.module_from_spec(mod_spec)
- mod_spec.loader.exec_module(mod)
- return mod
+ return bpy.utils.execfile(preset_path)
# -----------------------------------------------------------------------------