[Bf-blender-cvs] [5ec1d709e77] blender2.8: WM: use Python bytecode cache to run presets

[Campbell Barton]

Commit: 5ec1d709e7717537b9f60e4b9ea997c56f6c5c15
Author: Campbell Barton
Date:   Thu Nov 15 18:42:23 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB5ec1d709e7717537b9f60e4b9ea997c56f6c5c15

WM: use Python bytecode cache to run presets

Key-maps can be very large, avoid parsing on every startup.

===================================================================

M	release/scripts/modules/bpy_extras/keyconfig_utils.py
M	release/scripts/startup/bl_operators/presets.py

===================================================================

diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py
index 316884e3fe1..51f1980f519 100644
--- a/release/scripts/modules/bpy_extras/keyconfig_utils.py
+++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py
@@ -514,7 +514,7 @@ def keyconfig_module_from_preset(name, preset_reference_filename=None):
         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("__bl_keymap__", preset_path)
+    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
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py
index 5ff8f6f591c..9b83ee92ab4 100644
--- a/release/scripts/startup/bl_operators/presets.py
+++ b/release/scripts/startup/bl_operators/presets.py
@@ -245,9 +245,14 @@ class ExecutePreset(Operator):
         if hasattr(preset_class, "reset_cb"):
             preset_class.reset_cb(context)
 
-        # execute the preset using script.python_file_run
         if ext == ".py":
-            bpy.ops.script.python_file_run(filepath=filepath)
+            import importlib.util
+            mod_spec = importlib.util.spec_from_file_location("__main__", filepath)
+            try:
+                mod_spec.loader.exec_module(importlib.util.module_from_spec(mod_spec))
+            except Exception as ex:
+                self.report({'ERROR'}, "Failed to executge the preset: " + repr(ex))
+
         elif ext == ".xml":
             import rna_xml
             rna_xml.xml_file_run(context,